shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Remove compiler warning.

* src/truetype/ttgload.c (TT_Load_Glyph)
[!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2012-04-07  Werner Lemberg  <[email protected]>

+

+	Remove compiler warning.

+

+	* src/truetype/ttgload.c (TT_Load_Glyph)

+	[!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly.

+

 2012-03-28  Werner Lemberg  <[email protected]>

 	[autofit] Properly copy scaler flags to script metrics object.

--- a/src/truetype/ttgload.c

+++ b/src/truetype/ttgload.c

@@ -1983,13 +1983,11 @@

                  FT_UInt       glyph_index,

                  FT_Int32      load_flags )

   {

-    TT_Face       face;

     FT_Error      error;

     TT_LoaderRec  loader;

-    face   = (TT_Face)glyph->face;

-    error  = TT_Err_Ok;

+    error = TT_Err_Ok;

 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS

@@ -2003,10 +2001,7 @@

       error = load_sbit_image( size, glyph, glyph_index, load_flags );

       if ( !error )

       {

-        FT_Face  root = &face->root;

-

-

-        if ( FT_IS_SCALABLE( root ) )

+        if ( FT_IS_SCALABLE( glyph->face ) )

         {

           /* for the bbox we need the header only */

           (void)tt_loader_init( &loader, size, glyph, load_flags, TRUE );