[cairo-commit] cairo configure.in, 1.115, 1.116 ChangeLog, 1.804, 1.805

[Billy Biggs]

Committed by: vektor

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

Modified Files:
	configure.in ChangeLog 
Log Message:
	reviewed by: keithp

	* src/cairo-ft-font.c: (_ft_unscaled_font_set_scale): Support
	versions of freetype without exact FT_Bitmap_Size.x/y_ppem
	values by using the pixel width and height values instead.

	* configure.in: Add a check for FT_Bitmap_Size.y_ppem.


Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure.in	28 Jul 2005 19:45:26 -0000	1.115
+++ configure.in	31 Jul 2005 18:19:47 -0000	1.116
@@ -273,6 +273,20 @@
   AC_SUBST(FREETYPE_CFLAGS)
   AC_SUBST(FREETYPE_LIBS)
   AC_SUBST(FREETYPE_REQUIRES)
+
+  temp_save_libs="$LIBS"
+  temp_save_cflags="$CFLAGS"
+  LIBS="$LIBS $FREETYPE_LIBS"
+  CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+  AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,
+                  HAVE_FT_BITMAP_SIZE_Y_PPEM=1,
+                  HAVE_FT_BITMAP_SIZE_Y_PPEM=0,
+                  [#include<ft2build.h>
+                   #include FT_FREETYPE_H])
+  AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
+                     [FT_Bitmap_Size structure includes y_ppem field])
+  LIBS="$temp_save_libs"
+  CFLAGS="$temp_save_cflags"
 fi
 
 CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS"

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -d -r1.804 -r1.805
--- ChangeLog	31 Jul 2005 18:03:35 -0000	1.804
+++ ChangeLog	31 Jul 2005 18:19:47 -0000	1.805
@@ -1,5 +1,15 @@
 2005-07-31  Billy Biggs  <vektor at dumbterm.net>
 
+	reviewed by: keithp
+
+	* src/cairo-ft-font.c: (_ft_unscaled_font_set_scale): Support
+	versions of freetype without exact FT_Bitmap_Size.x/y_ppem
+	values by using the pixel width and height values instead.
+
+	* configure.in: Add a check for FT_Bitmap_Size.y_ppem.
+
+2005-07-31  Billy Biggs  <vektor at dumbterm.net>
+
 	* src/cairo-quartz-surface.c: (cairo_quartz_surface_create):
 	Cast away the const on the nil surface to avoid a compiler warning.