[cairo-commit] cairo ChangeLog, 1.292, 1.293 cairo.pc.in, 1.16, 1.17 configure.in, 1.68, 1.69

[Keith Packard]

Committed by: keithp

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv10732

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
2005-01-11  Keith Packard  <keithp at keithp.com>

	* 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


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- ChangeLog	7 Jan 2005 07:20:07 -0000	1.292
+++ ChangeLog	11 Jan 2005 18:03:01 -0000	1.293
@@ -1,3 +1,51 @@
+2005-01-11  Keith Packard  <keithp at keithp.com>
+
+	* 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
+
 2005-01-07  Kristian Høgsberg  <krh at redhat.com>
 
 	* configure.in: Add -lz to CAIRO_LIBS when compiling the PDF

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cairo.pc.in	26 Oct 2004 21:38:43 -0000	1.16
+++ cairo.pc.in	11 Jan 2005 18:03:01 -0000	1.17
@@ -8,6 +8,6 @@
 Version: @VERSION@
 
 Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
-Libs: -L${libdir} -lcairo -lm
-Cflags: -I${includedir} @FREETYPE_CFLAGS@
+Libs: -L${libdir} -lcairo
+Cflags: -I${includedir}
 

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- configure.in	7 Jan 2005 07:20:07 -0000	1.68
+++ configure.in	11 Jan 2005 18:03:01 -0000	1.69
@@ -34,6 +34,12 @@
 AM_PROG_LIBTOOL
 AC_STDC_HEADERS
 
+AC_CHECK_LIBM
+
+LIBS="$LIBS $LIBM"
+
+AC_CHECK_FUNCS(sincos)
+
 dnl ===========================================================================
 
 AC_ARG_ENABLE(xlib,
@@ -268,7 +274,7 @@
 fi
 
 CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS"
-CAIRO_LIBS="$CAIRO_LIBS -lm"
+CAIRO_LIBS="$CAIRO_LIBS"
 
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)