Ok, so I messed up the test for y_ppem. Let's see if I got it right this

    time.

diff --git a/ChangeLog b/ChangeLog
index b75341f78bd8a643097d3aaf5ca6655d0dd3d709..d532022e21013dee9b2db71bf12481413169503b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-11  Keith Packard  <keithp@keithp.com>
+
+       * configure.in:
+       * src/fcfreetype.c: (FcGetPixelSize):
+       Ok, so I messed up the test for y_ppem.  Let's see if I
+       got it right this time.
+
 2004-02-10  Keith Packard  <keithp@keithp.com>
 
        * configure.in:

diff --git a/configure.in b/configure.in
index 299410c80ea4476ac80323a306d11f467c9abd06..100d7b9ea44a8c9d05485e559c9dece777abcc60 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -125,20 +125,11 @@ fontconfig_save_cflags="$CFLAGS"
 LIBS="$LIBS $FREETYPE_LIBS"
 CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
 AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names)
-AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,,,
+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])
-LIBS="$fontconfig_save_libs"
-CFLAGS="$fontconfig_save_cflags"
-
-case "$ac_cv_member_FT_Bitmap_Size_y_ppem" in
-yes)
-       HAVE_FT_BITMAP_SIZE_Y_PPEM=1
-       ;;
-*)
-       HAVE_FT_BITMAP_SIZE_Y_PPEM=0
-       ;;
-esac
 AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
                   [FT_Bitmap_Size structure includes y_ppem field])
 

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index ea2ee88a570bd6967e14461d188e715dddd91abd..78fe20ca56037e319933d7c397f6538e87c4efe1 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -347,7 +347,7 @@ static const FcStringConst  slantConsts[] = {
 static double
 FcGetPixelSize (FT_Face face, int i)
 {
-#ifdef HAVE_FT_GET_BDF_PROPERTY
+#if HAVE_FT_GET_BDF_PROPERTY
     if (face->num_fixed_sizes == 1)
     {
        BDF_PropertyRec prop;
@@ -358,7 +358,7 @@ FcGetPixelSize (FT_Face face, int i)
            return (double) prop.u.integer;
     }
 #endif
-#ifdef HAVE_FT_BITMAP_SIZE_Y_PPEM
+#if HAVE_FT_BITMAP_SIZE_Y_PPEM
     return (double) face->available_sizes[i].y_ppem / 64.0;
 #else
     return (double) face->available_sizes[i].height / 64.0;