* src/autofit/aflatin.c, src/cff/cffdriver.c, src/truetype/ttobjs.c,

src/truetype/ttinterp.c: fixing compiler warnings
18 years ago · 2212272992
parent 9b774e2822
commit 2212272992
5 changed files with 10 additions and 5 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2007-01-16  David Turner  <david@freetype.org>
+
+        * 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  <TetiSoft@apg.lahn.de>

 	* builds/amiga/makefile, builds/amiga/makefile.os4,
--- 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;
--- 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;
    }
--- 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              */
--- 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 &&