minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Remove compiler warning. 

* src/truetype/ttgload.c (TT_Load_Glyph)
[!TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Access `glyph->face' directly.
This commit is contained in:
Werner Lemberg 2012-04-07 06:39:25 +02:00
parent 8be32d2f4a
commit 9c6d1ac39c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

9
src/truetype/ttgload.c
View File

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