From 221227299273e30bc41d86d7112dd4120b82dd2a Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 16 Jan 2007 20:06:44 +0000 Subject: [PATCH] * src/autofit/aflatin.c, src/cff/cffdriver.c, src/truetype/ttobjs.c, src/truetype/ttinterp.c: fixing compiler warnings --- ChangeLog | 5 +++++ src/autofit/aflatin.c | 2 +- src/cff/cffdrivr.c | 4 ++-- src/truetype/ttinterp.c | 2 +- src/truetype/ttobjs.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c5997564..cecf587d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-16 David Turner + + * src/autofit/aflatin.c, src/cff/cffdriver.c, src/truetype/ttobjs.c, + src/truetype/ttinterp.c: fixing compiler warnings + 2007-01-15 Detlef Würkner * builds/amiga/makefile, builds/amiga/makefile.os4, diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 5b48afbd6..cb85e9d50 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -723,7 +723,7 @@ segment->min_coord = (FT_Short)min_pos; segment->max_coord = (FT_Short)max_pos; - segment->height = segment->max_coord - segment->min_coord; + segment->height = (FT_Short)(segment->max_coord - segment->min_coord); on_edge = 0; segment = NULL; diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 7728cf7fa..921557c19 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -337,8 +337,8 @@ cff->psnames ); font_info->italic_angle = dict->italic_angle; font_info->is_fixed_pitch = dict->is_fixed_pitch; - font_info->underline_position = dict->underline_position; - font_info->underline_thickness = dict->underline_thickness; + font_info->underline_position = (FT_Short) dict->underline_position; + font_info->underline_thickness = (FT_Short) dict->underline_thickness; cff->font_info = font_info; } diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index c636406e9..9d751f946 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -5417,7 +5417,7 @@ first_point = (FT_UShort)( CUR.pts.contours[contour - 1] + 1 - CUR.pts.first_point ); - last_point = CUR.pts.contours[contour] - CUR.pts.first_point; + last_point = (FT_UShort)(CUR.pts.contours[contour] - CUR.pts.first_point); /* XXX: this is probably wrong... at least it prevents memory */ /* corruption when zp2 is the twilight zone */ diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index dbd2bda2d..f4665d856 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -292,7 +292,7 @@ } } - ttface->internal->ignore_unpatented_hinter = !unpatented_hinting; + ttface->internal->ignore_unpatented_hinter = FT_BOOL(!unpatented_hinting); } #endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING &&