shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* src/base/ftobjs.c (FT_Open_Face): don't call FT_New_GlyphSlot and
  FT_New_Size if we're opening a face with face_index < 0 (which is only
  used for testing the format).

  * src/gxvalid/gxvmort0.c: removed compiler warning

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2005-10-17  David Turner  <[email protected]>

+

+  * src/base/ftobjs.c (FT_Open_Face): don't call FT_New_GlyphSlot and

+  FT_New_Size if we're opening a face with face_index < 0 (which is only

+  used for testing the format).

+

+  * src/gxvalid/gxvmort0.c: removed compiler warning

+

 2005-10-16  David Turner  <[email protected]>

   * src/tools/apinames.c: adding new tool to extract public API

--- a/src/base/ftobjs.c

+++ b/src/base/ftobjs.c

@@ -1716,22 +1716,25 @@

     /* now allocate a glyph slot object for the face */

     FT_TRACE4(( "FT_Open_Face: Creating glyph slot\n" ));

-    error = FT_New_GlyphSlot( face, NULL );

-    if ( error )

-      goto Fail;

-

-    /* finally, allocate a size object for the face */

+    if ( face_index >= 0 )

     {

-      FT_Size  size;

+      error = FT_New_GlyphSlot( face, NULL );

+      if ( error )

+        goto Fail;

+      /* finally, allocate a size object for the face */

+      {

+        FT_Size  size;

-      FT_TRACE4(( "FT_Open_Face: Creating size object\n" ));

-      error = FT_New_Size( face, &size );

-      if ( error )

-        goto Fail;

+        FT_TRACE4(( "FT_Open_Face: Creating size object\n" ));

-      face->size = size;

+        error = FT_New_Size( face, &size );

+        if ( error )

+          goto Fail;

+

+        face->size = size;

+      }

     }

     /* initialize internal face data */

--- a/src/gxvalid/gxvmort0.c

+++ b/src/gxvalid/gxvmort0.c

@@ -73,7 +73,7 @@

     FT_UShort  dontAdvance;

     FT_UShort  markLast;

     FT_UShort  reserved;

-    FT_UShort  verb;

+    FT_UShort  verb = 0;

     FT_UNUSED( state );

     FT_UNUSED( table );