Commit 9c6d1ac39c417dcd0e0c7389e9afd09f5104bc0a
2012-04-07T06:39:25
Remove compiler warning. * src/truetype/ttgload.c (TT_Load_Glyph) [!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/ChangeLog b/ChangeLog
index eb94bf4..e6e1002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-07 Werner Lemberg <wl@gnu.org>
+
+ Remove compiler warning.
+
+ * src/truetype/ttgload.c (TT_Load_Glyph)
+ [!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly.
+
2012-03-28 Werner Lemberg <wl@gnu.org>
[autofit] Properly copy scaler flags to script metrics object.
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index ce8c888..22cbc09 100644
--- 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 );