walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

time.
This commit is contained in:
Keith Packard 2004-02-11 18:53:05 +00:00
parent 4f38fa8106
commit 208a720f00
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2004-02-10 Keith Packard <keithp@keithp.com>
* configure.in: * configure.in:

15
configure.in
View File

@ -125,20 +125,11 @@ fontconfig_save_cflags="$CFLAGS"
LIBS="$LIBS $FREETYPE_LIBS" LIBS="$LIBS $FREETYPE_LIBS"
CFLAGS="$CFLAGS $FREETYPE_CFLAGS" 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_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 <ft2build.h>
#include FT_FREETYPE_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, AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
[FT_Bitmap_Size structure includes y_ppem field]) [FT_Bitmap_Size structure includes y_ppem field])

4
src/fcfreetype.c
View File

@ -347,7 +347,7 @@ static const FcStringConst slantConsts[] = {
static double static double
FcGetPixelSize (FT_Face face, int i) FcGetPixelSize (FT_Face face, int i)
{ {
#ifdef HAVE_FT_GET_BDF_PROPERTY #if HAVE_FT_GET_BDF_PROPERTY
if (face->num_fixed_sizes == 1) if (face->num_fixed_sizes == 1)
{ {
BDF_PropertyRec prop; BDF_PropertyRec prop;
@ -358,7 +358,7 @@ FcGetPixelSize (FT_Face face, int i)
return (double) prop.u.integer; return (double) prop.u.integer;
} }
#endif #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; return (double) face->available_sizes[i].y_ppem / 64.0;
#else #else
return (double) face->available_sizes[i].height / 64.0; return (double) face->available_sizes[i].height / 64.0;