shithub: freetype+ttf2subf

Download patch

ref: 35fd84b96a776f9e2aa1972dc07d650603e2a6d2
parent: 8d4ccf5384b6a41d0779e99dbdec115a41188750
author: Werner Lemberg <[email protected]>
date: Tue Mar 8 01:00:35 EST 2005

Formatting.

git/fs: mount .git/fs: mount/attach disallowed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 2005-03-06  David Turner  <[email protected]>
 
-  * src/otvalid/{otvgsub.c, otvgpos.c}: making static tables constant
+	* src/otvalid/otvgsub.c, src/otvalid/otvgpos.c: Make static tables
+	constant.
 
-  * src/autofit/aflatin.c (af_latin_metrics_init): fixing bug #12212
-  (auto-hinter refuses to work if no Unicode charmap in font)
+	* src/autofit/aflatin.c (af_latin_metrics_init): Fix Savannah bug
+	#12212 (auto-hinter refuses to work if no Unicode charmap in font).
 
 2005-03-05  Werner Lemberg  <[email protected]>
 
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType high-level API and common types (specification only).       */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004 by                               */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -2652,13 +2652,13 @@
   /*                                                                       */
   /* <Description>                                                         */
   /*    Retrieves the ASCII Postscript name of a given face, if available. */
-  /*    This should only work with Postscript and TrueType fonts.          */
+  /*    This only works with Postscript and TrueType fonts.                */
   /*                                                                       */
   /* <Input>                                                               */
   /*    face :: A handle to the source face object.                        */
   /*                                                                       */
   /* <Return>                                                              */
-  /*    A pointer to the face's Postscript name.  NULL if un-available.    */
+  /*    A pointer to the face's Postscript name.  NULL if unavailable.     */
   /*                                                                       */
   /* <Note>                                                                */
   /*    The returned pointer is owned by the face and will be destroyed    */
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -377,7 +377,7 @@
   af_latin_metrics_init( AF_LatinMetrics  metrics,
                          FT_Face          face )
   {
-    FT_Error    error = 0;
+    FT_Error    error = FT_Err_Ok;
     FT_CharMap  oldmap = face->charmap;
     FT_UInt     ee;
 
@@ -397,7 +397,7 @@
     for ( ee = 0; latin_encodings[ee] != FT_ENCODING_NONE; ee++ )
     {
       error = FT_Select_Charmap( face, latin_encodings[ee] );
-      if (!error)
+      if ( !error )
         break;
     }
 
@@ -408,7 +408,7 @@
     }
 
     FT_Set_Charmap( face, oldmap );
-    return 0;
+    return FT_Err_Ok;
   }
 
 
--- a/src/otvalid/otvgpos.c
+++ b/src/otvalid/otvgpos.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType GPOS table validation (body).                               */
 /*                                                                         */
-/*  Copyright 2002, 2004 by                                                */
+/*  Copyright 2002, 2004, 2005 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -954,7 +954,7 @@
                               OTV_Validator  valid )
   {
     valid->type_count = 9;
-    valid->type_funcs = (OTV_Validate_Func*) otv_gpos_validate_funcs;
+    valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs;
 
     otv_Lookup_validate( table, valid );
   }
@@ -996,7 +996,7 @@
     LookupList  = FT_NEXT_USHORT( p );
 
     valid->type_count  = 9;
-    valid->type_funcs  = (OTV_Validate_Func*) otv_gpos_validate_funcs;
+    valid->type_funcs  = (OTV_Validate_Func*)otv_gpos_validate_funcs;
     valid->glyph_count = glyph_count;
 
     otv_LookupList_validate( table + LookupList,
--- a/src/otvalid/otvgsub.c
+++ b/src/otvalid/otvgsub.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType GSUB table validation (body).                               */
 /*                                                                         */
-/*  Copyright 2004 by                                                      */
+/*  Copyright 2004, 2005 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -567,7 +567,7 @@
     LookupList  = FT_NEXT_USHORT( p );
 
     valid->type_count  = 8;
-    valid->type_funcs  = (OTV_Validate_Func*) otv_gsub_validate_funcs;
+    valid->type_funcs  = (OTV_Validate_Func*)otv_gsub_validate_funcs;
     valid->glyph_count = glyph_count;
 
     otv_LookupList_validate( table + LookupList,