* 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
This commit is contained in:
David Turner 2005-10-17 21:17:20 +00:00
parent 6c5299e44f
commit 92f30c812c
3 changed files with 24 additions and 13 deletions

View File

@ -1,3 +1,11 @@
2005-10-17 David Turner <david@freetype.org>
* 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 <david@freetype.org>
* src/tools/apinames.c: adding new tool to extract public API

View File

@ -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;
FT_TRACE4(( "FT_Open_Face: Creating size object\n" ));
error = FT_New_Size( face, &size );
error = FT_New_GlyphSlot( face, NULL );
if ( error )
goto Fail;
face->size = size;
/* 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;
face->size = size;
}
}
/* initialize internal face data */

View File

@ -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 );