[ft] ft 2.2RC4 VS2003 patch

[luoyi]

in order to compile well under VS2003, need the following patch:

? objs/freetype.def
? objs/ftmodule.h
Index: src/autofit/afcjk.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/autofit/afcjk.c,v
retrieving revision 1.6
diff -u -r1.6 afcjk.c
--- src/autofit/afcjk.c 25 Feb 2006 12:49:39 -0000 1.6
+++ src/autofit/afcjk.c 29 Mar 2006 10:19:56 -0000
@@ -167,7 +167,7 @@
    FT_Pos        dist_threshold;


-    len_threshold = AF_LATIN_CONSTANT( hints->metrics, 8 );
+    len_threshold = (FT_UShort)AF_LATIN_CONSTANT( hints->metrics, 8 );

    dist_threshold = ( dim == AF_DIMENSION_HORZ ) ? hints->x_scale
                                                  : hints->y_scale;
Index: src/autofit/aflatin.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/autofit/aflatin.c,v
retrieving revision 1.30
diff -u -r1.30 aflatin.c
--- src/autofit/aflatin.c 11 Feb 2006 13:22:37 -0000 1.30
+++ src/autofit/aflatin.c 29 Mar 2006 10:19:38 -0000
@@ -860,11 +860,11 @@
    AF_Segment    seg1, seg2;


-    len_threshold = AF_LATIN_CONSTANT( hints->metrics, 8 );
+    len_threshold = (FT_UShort)AF_LATIN_CONSTANT( hints->metrics, 8 );
    if ( len_threshold == 0 )
      len_threshold = 1;

-    len_score = AF_LATIN_CONSTANT( hints->metrics, 3000 );
+    len_score = (FT_UShort)AF_LATIN_CONSTANT( hints->metrics, 3000 );

    /* now compare each segment to the others */
    for ( seg1 = segments; seg1 < segment_limit; seg1++ )
Index: src/sfnt/sfobjs.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/sfnt/sfobjs.c,v
retrieving revision 1.116
diff -u -r1.116 sfobjs.c
--- src/sfnt/sfobjs.c 22 Feb 2006 07:59:35 -0000 1.116
+++ src/sfnt/sfobjs.c 29 Mar 2006 10:18:38 -0000
@@ -947,7 +947,7 @@
            if ( error )
              goto Exit;

-            bsize->height = metrics.height >> 6;
+            bsize->height = (FT_Short)metrics.height >> 6;
            bsize->width = (FT_Short)(
                ( avgwidth * metrics.x_ppem + em_size / 2 ) / em_size );

Index: src/sfnt/ttmtx.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/sfnt/ttmtx.c,v
retrieving revision 1.11
diff -u -r1.11 ttmtx.c
--- src/sfnt/ttmtx.c 22 Feb 2006 08:23:35 -0000 1.11
+++ src/sfnt/ttmtx.c 29 Mar 2006 10:18:08 -0000
@@ -214,9 +214,9 @@
    FT_FRAME_EXIT();

    if ( vertical )
-      face->vertical.number_Of_VMetrics = num_longs;
+      face->vertical.number_Of_VMetrics = (FT_UShort)num_longs;
    else
-      face->horizontal.number_Of_HMetrics = num_longs;
+      face->horizontal.number_Of_HMetrics = (FT_UShort)num_longs;

  Fail:
    return error;
Index: src/truetype/ttgload.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/truetype/ttgload.c,v
retrieving revision 1.162
diff -u -r1.162 ttgload.c
--- src/truetype/ttgload.c 14 Feb 2006 08:37:03 -0000 1.162
+++ src/truetype/ttgload.c 29 Mar 2006 10:16:30 -0000
@@ -1604,7 +1604,7 @@


      widthp = tt_face_get_device_metrics( face,
-                                           size->root.metrics.x_ppem,
+
(FT_Byte)size->root.metrics.x_ppem,
                                           glyph_index );

      if ( widthp )
Index: src/type1/t1afm.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/type1/t1afm.c,v
retrieving revision 1.48
diff -u -r1.48 t1afm.c
--- src/type1/t1afm.c 31 Jan 2006 07:01:24 -0000 1.48
+++ src/type1/t1afm.c 29 Mar 2006 10:17:22 -0000
@@ -285,8 +285,8 @@
      t1_face->bbox.xMax = ( fi->FontBBox.xMax + 0xFFFFU ) >> 16;
      t1_face->bbox.yMax = ( fi->FontBBox.yMax + 0xFFFFU ) >> 16;

-      t1_face->ascender  = ( fi->Ascender  + 0x8000U ) >> 16;
-      t1_face->descender = ( fi->Descender + 0x8000U ) >> 16;
+      t1_face->ascender  = (FT_Short)( fi->Ascender  + 0x8000U ) >> 16;
+      t1_face->descender = (FT_Short)( fi->Descender + 0x8000U ) >> 16;

      if ( fi->NumKernPair )
      {