diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | src/autofit/afglobal.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + autofit: Cast FT_Long glyph_count to compare with FT_UInt GID. + + * src/autofit/afglobal.c (af_face_globals_is_digit, + af_face_globals_compute_script_coverage): Cast FT_Long + globals->glyph_count to FT_ULong, to compare with FT_UInt + gindex. + +2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + smooth: Exclude 16-bit system in invalid pitch/height check. * src/smooth/ftsmooth.c (ft_smooth_render_generic): diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index 01f5b1e79..ac293619d 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -152,7 +152,7 @@ FT_UInt gindex = FT_Get_Char_Index( face, i ); - if ( gindex != 0 && gindex < globals->glyph_count ) + if ( gindex != 0 && gindex < (FT_ULong)globals->glyph_count ) gscripts[gindex] |= AF_DIGIT; } @@ -310,7 +310,7 @@ af_face_globals_is_digit( AF_FaceGlobals globals, FT_UInt gindex ) { - if ( gindex < globals->glyph_count ) + if ( gindex < (FT_ULong)globals->glyph_count ) return (FT_Bool)( globals->glyph_scripts[gindex] & AF_DIGIT ); return (FT_Bool)0; |