head 1.22; access; symbols RELEASE_1_0_2:1.22 BRANCH_1_0:1.22.0.2 RELEASE_1_0_0:1.22 BRANCH_SCALED_GLYPH:1.21.0.2 RELEASE_0_9_2:1.21 RELEASE_0_9_0:1.20 SNAPSHOT_0_6_0:1.20 SNAPSHOT_0_5_2:1.20 SNAPSHOT_0_5_1:1.20 SNAPSHOT_0_5_0:1.20 SNAPSHOT_0_4_0:1.20 SNAPSHOT_0_3_0:1.19 SNAPSHOT_0_2_0:1.16 LGPL_CHANGE_AFTER:1.14 LGPL_CHANGE_BEFORE:1.14 SNAPSHOT_0_1_23:1.14 SNAPSHOT_0_1_22:1.14 SNAPSHOT_0_1_21:1.14 SNAPSHOT_0_1_20:1.13 SNAPSHOT_0_1_16:1.7; locks; strict; comment @# @; 1.22 date 2005.08.17.22.57.45; author krh; state Exp; branches; next 1.21; commitid 111d4303c0df4567; 1.21 date 2005.08.10.19.36.51; author cworth; state Exp; branches; next 1.20; commitid 16b242fa57504567; 1.20 date 2005.02.24.16.20.14; author otaylor; state Exp; branches; next 1.19; 1.19 date 2005.01.20.16.28.54; author cworth; state Exp; branches; next 1.18; 1.18 date 2005.01.12.22.40.14; author cworth; state Exp; branches; next 1.17; 1.17 date 2005.01.11.18.03.01; author keithp; state Exp; branches; next 1.16; 1.16 date 2004.10.26.21.38.43; author cworth; state Exp; branches; next 1.15; 1.15 date 2004.09.11.11.23.17; author davidr; state Exp; branches; next 1.14; 1.14 date 2004.04.09.21.19.47; author davidr; state Exp; branches; next 1.13; 1.13 date 2004.04.06.16.36.12; author davidr; state Exp; branches; next 1.12; 1.12 date 2004.03.31.02.45.00; author cworth; state Exp; branches; next 1.11; 1.11 date 2004.02.24.20.27.52; author oandrieu; state Exp; branches; next 1.10; 1.10 date 2003.12.12.19.44.16; author cworth; state Exp; branches; next 1.9; 1.9 date 2003.12.11.20.43.58; author cworth; state Exp; branches; next 1.8; 1.8 date 2003.12.11.17.35.07; author cworth; state Exp; branches; next 1.7; 1.7 date 2003.12.03.15.14.59; author cworth; state Exp; branches; next 1.6; 1.6 date 2003.11.18.15.28.16; author james; state Exp; branches; next 1.5; 1.5 date 2003.11.04.16.58.53; author cworth; state Exp; branches; next 1.4; 1.4 date 2003.11.04.16.33.45; author cworth; state Exp; branches; next 1.3; 1.3 date 2003.08.01.05.41.44; author rth; state Exp; branches; next 1.2; 1.2 date 2003.07.30.15.30.50; author cworth; state Exp; branches; next 1.1; 1.1 date 2003.07.18.18.34.19; author cworth; state Exp; branches; next ; desc @@ 1.22 log @2005-08-17 Kristian Høgsberg * configure.in: Try to use pkg-config to detect freetype2, then fall back to the existing freetype-config based check. @ text @prefix=@@prefix@@ exec_prefix=@@exec_prefix@@ libdir=@@libdir@@ includedir=@@includedir@@ Name: cairo Description: Multi-platform 2D graphics library Version: @@VERSION@@ @@PKGCONFIG_REQUIRES@@: @@FREETYPE_REQUIRES@@ @@XRENDER_REQUIRES@@ @@PNG_REQUIRES@@ @@GLITZ_REQUIRES@@ Libs: @@FREETYPE_CONFIG_LIBS@@ -L${libdir} -lcairo Cflags: @@FREETYPE_CONFIG_CFLAGS@@ -I${includedir}/cairo @ 1.21 log @ 2005-08-10 Carl Worth From Keith Packard , Build pixman internally as a private part of cairo, with suitable name changes to avoid any visible pixman symbols in the cairo library: * Makefile.am: Descend into pixman. * cairo.pc.in: Drop libpixman from Requires. * configure.in: Don't check for libpixman. Check version of pkg-config and use Requires.private instead of Requires in cairo.pc if possible. Generate pixman Makefiles. * pixman/Makefile.am: Rip out release-publish target and installation of libpixman.pc. * pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la target. * pixman/src/icint.h: Fix to include config.h rather than ../config.h * pixman/src/pixman-remap.h: This is the cpp magic to rename all pixman functions from the various fb, Fb, INT_pixman, pixman, Render, _Render, or no prefix to _cairo_pixman_ prefixes. * pixman/src/pixman.h: Include pixman-remap.h to get all the cairo-internalized names. * src/Makefile.am: * test/Makefile.am: Add -Ipixman/src to get at pixman-remap.h. @ text @d11 2 a12 2 Libs: @@FREETYPE_LIBS@@ -L${libdir} -lcairo Cflags: @@FREETYPE_CFLAGS@@ -I${includedir}/cairo @ 1.20 log @2005-02-24 Owen Taylor * src/cairo_win32_surface.c (_cairo_win32_surface_destroy): When we created a DC/bitmap pair, delete the DC before the Bitmap so that the Bitmap will be released from the DC and can be destroyed. (Reported by Hans Breuer) * configure.in cairo.pc.in: Only require fontconfig if building FreeType font backend. * configure.in: Fix output when reporting Win32 font backend. @ text @d10 1 a10 1 Requires: @@FREETYPE_REQUIRES@@ libpixman @@XRENDER_REQUIRES@@ @@PNG_REQUIRES@@ @@GLITZ_REQUIRES@@ @ 1.19 log @ * src/cairoint.h: Track various renamings. * src/cairo_xlib_surface.c: * src/cairo_ps_surface.c: * src/cairo_png_surface.c: * src/cairo_pdf_surface.c: * src/cairo_glitz_surface.c: * src/cairo_ft_font.c: Insert new includes for backend-specific header files. * src/cairo_gdip_surface.cpp: * src/cairo_gdip_font.cpp: Remove redundant include of cairo-features.h. * src/cairo.h (CAIRO_H): Rename header-exclusion macro from _CAIRO_H_ to CAIRO_H. Remove platform-specific grubbing for cairo-features.h and pixman.h in odd places. Remove all backend-specific prototypes, (as they are now in their own header files). Remove deprecated * src/cairo.c (cairo_sane_state): Remove printf. * src/cairo-features.h.in: Convert to utf-8. Use the proper name for multiple-header exclusion (CAIRO_FEATURES_H). Track rename of FREETYPE_FONT_FEATURE to FT_FONT_FEATURE. * src/Makefile.am (cairoinclude_HEADERS): Split cairo.h up into cairo.h, cairo-ft.h, cairo-glitz.h, cairo-pdf.h, cairo-png.h, cairo-ps.h, cairo-xcb.h, cairo-xlib.h. Update for rename of cairo_wideint.h to cairo-wideint.h. * configure.in: Rename CAIRO_HAS_FREETYPE_FONT to CAIRO_HAS_FT_FONT, (to match cairo_ft_font functions and cairo-ft.h). * cairo.pc.in (Cflags): Update for public header files now in /cairo. @ text @d10 1 a10 1 Requires: fontconfig libpixman @@XRENDER_REQUIRES@@ @@PNG_REQUIRES@@ @@GLITZ_REQUIRES@@ @ 1.18 log @ * src/cairo.c (cairo_sane_state): A NULL cairo_t * is not sane. * cairo.pc.in (Libs,Cflags): Add freetype flags so that things work with freetype in a non-standard location, (a little extra work here since freetype doesn't use pkg-config). * TODO: Add several items culled from recent mailing list discussions. * BUGS: Add bugs on cache locking and surface pattern scaling. @ text @d12 1 a12 2 Cflags: @@FREETYPE_CFLAGS@@ -I${includedir} @ 1.17 log @2005-01-11 Keith Packard * cairo.pc.in: * configure.in: * src/Makefile.am: Fix math library detection to use autotools helper * src/cairo_cache.c: (_cache_sane_state), (_cairo_cache_lookup): Remove cache memory usage assertions as single objects can be larger than the cache size * src/cairo_ft_font.c: (_cairo_ft_font_compute_transform), (_cairo_ft_font_install_transform), (_install_font_scale), (_cairo_ft_font_font_extents), (_cairo_ft_font_glyph_extents), (_cairo_ft_font_create_glyph): Decompose font matrix transformations into a couple of helper routines. Return all metrics in font space. * src/cairo_glitz_surface.c: (_glitz_format): Eliminate compiler warning * src/cairo_gstate.c: (_cairo_gstate_current_font_extents), (_cairo_gstate_text_to_glyphs), (_cairo_gstate_glyph_extents): Expect glyph metrics to be in font space. Compute text extents by fetching one glyph metric at a time, transforming to user space and computing the overall bounding box. * src/cairo_matrix.c: (_cairo_matrix_set_rotate), (_cairo_matrix_compute_scale_factors): use 'sincos' where available. Scale factors now ensure the non-scale transform is area preserving. Scale factors requires another parameter to mark the fixed axis. * src/cairo_wideint.c: * src/cairo_wideint.h: Change license to LGPL Mark int32x32_64_mul as broken (which it still is) * src/cairo_xlib_surface.c: (_cairo_xlib_surface_show_glyphs32), (_cairo_xlib_surface_show_glyphs16), (_cairo_xlib_surface_show_glyphs8): Ensure each glyph is located as close to the specified position as possible * src/cairoint.h: interface change to _cairo_matrix_compute_scale_factors @ text @d11 2 a12 2 Libs: -L${libdir} -lcairo Cflags: -I${includedir} @ 1.16 log @ * test/.cvsignore: * test/Makefile.am: * test/README: * test/cairo_test.c: * test/cairo_test.h: * test/line_width-ref.png: * test/line_width.c: * test/move_to_show_surface-ref.png: * test/move_to_show_surface.c: * test/read_png.c: * test/read_png.h: * test/write_png.c: * test/write_png.h: * test/xmalloc.c: * test/xmalloc.h: Add initial regression test suite. * configure.in: Don't AC_SUBST a dozen different FOO_CFLAGS and FOO_LIBS. Instead, incrementally build up just CAIRO_CFLAGS and CAIRO_LIBS. * cairo.pc.in (Libs): Don't list flags that should get picked up via dependency information through Requires. * BUGS (font-size): Add description of move_to_show_surface. @ text @d11 2 a12 2 Libs: -L${libdir} -lcairo -lm Cflags: -I${includedir} @@FREETYPE_CFLAGS@@ @ 1.15 log @Replaced the gl backend with the new glitz backend @ text @d11 1 a11 1 Libs: -L${libdir} -lcairo -lm @@XRENDER_LIBS@@ @@PS_LIBS@@ @@FREETYPE_LIBS@@ @ 1.14 log @Added OpenGL surface backend @ text @d10 1 a10 1 Requires: fontconfig libpixman @@XRENDER_REQUIRES@@ @@PNG_REQUIRES@@ @@GL_REQUIRES@@ @ 1.13 log @Added new pattern API @ text @d10 1 a10 1 Requires: fontconfig libpixman @@XRENDER_REQUIRES@@ @@PNG_REQUIRES@@ @ 1.12 log @ * configure.in: Add checks for Xrender.h in xrender.pc is not found. Remove AC_HELP_STRING to be compatible with older versions of autoconf (thanks to Bill Spitzak ). @ text @d11 1 a11 1 Libs: -L${libdir} -lcairo -lm @@PS_SURFACE_LIBS@@ @@FREETYPE_LIBS@@ @@XRENDER_LIBS@@ @ 1.11 log @autoconf support for the PNG backend. Bump version to 0.1.19. @ text @d11 1 a11 1 Libs: -L${libdir} -lcairo -lm @@PS_SURFACE_LIBS@@ @@FREETYPE_LIBS@@ @ 1.10 log @ * src/cairo.h: * src/cairo-features.h.in: * src/Makefile.am (libcairo_ps_sources): Add conditionals for ps_surface functions, etc. * configure.in: Get rid of AC_PATH_XTRA. Instead, find X includes/libraries only via pkg-config xrender. Switch option from --without-x to --disable-xlib Add option --disable-ps * cairo.pc.in (Libs): Add -lz only if ps_surface backend is compiled. @ text @d10 1 a10 1 Requires: fontconfig libpixman @@XRENDER_REQUIRES@@ @ 1.9 log @ * src/cairoint.h (slim_hidden_proto1): Directly fold in slim stuff rather than depending on it from an external package. * src/cairo_ps_surface.c (_cairo_ps_surface_copy_page): * src/cairo_image_surface.c: Switch from libic to libpixman. * src/cairo.h: Include pixman.h not ic.h. (__external_linkage): Directly fold in slim stuff rather than depending on it from an external package. * configure.in (PKG_CHECK_MODULES): * cairo.pc.in (Requires): Look for libpixman instead of libic and slim. @ text @d11 1 a11 1 Libs: -L${libdir} -lcairo -lm -lz @@FREETYPE_LIBS@@ @ 1.8 log @ * cairo.pc.in (Requires): * configure.in: Add xrender to cairo.pc Renders line if needed. @ text @d10 1 a10 1 Requires: fontconfig libic slim @@XRENDER_REQUIRES@@ @ 1.7 log @ * cairo.pc.in (Libs): Add -lz for the compress function used in the PS backend. @ text @d10 1 a10 1 Requires: fontconfig libic slim @ 1.6 log @2003-11-18 James Henstridge * cairo.pc.in (Cflags): add FREETYPE_CFLAGS/LIBS to Libs/Cflags rather than requiring "freetype2", which doesn't exist in anything but the most recent version of freetype. * configure.in (FREETYPE_LIBS): add freetype cflags/libs substitutions. @ text @d11 1 a11 1 Libs: -L${libdir} -lcairo -lm @@FREETYPE_LIBS@@ @ 1.5 log @Add explicit fontconfig and freetype2 dependencies that were implicitly dropped along with Xft. @ text @d10 3 a12 3 Requires: fontconfig freetype2 libic slim Libs: -L${libdir} -lcairo -lm Cflags: -I${includedir} @ 1.4 log @Fix configure.in and cairo.pc.in now that cairo no longer depends on Xft. @ text @d10 1 a10 1 Requires: libic slim @ 1.3 log @ * cairo.pc.in: Depend on slim. * configure.in: Check for slim. * src/cairo.h: Include slim_{export,import}.h as needed; mark all symbols __external_linkage. * src/cairoint.h: Include slim_internal.h; mark all symbols __internal_linkage. Provide slim_hidden_proto symbols as needed. * src/cairo.c, src/cairo_matrix.c, src/cairo_surface.c, Provide slim_hidden_def symbols as needed. * src/cairo_traps.c (cairo_traps_add_trap): Mark static. (cairo_traps_add_trap_from_points): Likewise. @ text @d10 1 a10 1 Requires: libic xft slim @ 1.2 log @Made all changes necessary to abandon the Xc library, (sucking the functionality up into cairo_surface_t instead). Eliminated most of the remaining X datatypes (XFixed, XPointFixed, XLineFixed, XTrapezoid). Fixed some numerical problems relating to pen initialization and intersection calculation. @ text @d10 1 a10 1 Requires: libic xft @ 1.1 log @Renamed everything from Xr* to cairo_* @ text @d10 1 a10 1 Requires: xc xft @