diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
| commit | 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 (patch) | |
| tree | 1e6ec8ccf2dbf773260a1953b8e13c49f9b7c5f5 /freetype/src/base/ftglyph.c | |
| parent | 529236591df7366479a6fac30b387667678fd1ba (diff) | |
| download | vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.gz vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.bz2 vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.zip | |
svn merge -r524:HEAD "^/branches/released" .
Diffstat (limited to 'freetype/src/base/ftglyph.c')
| -rw-r--r-- | freetype/src/base/ftglyph.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/freetype/src/base/ftglyph.c b/freetype/src/base/ftglyph.c index 24359cb6c..2da7409af 100644 --- a/freetype/src/base/ftglyph.c +++ b/freetype/src/base/ftglyph.c @@ -372,7 +372,7 @@ if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) clazz = FT_BITMAP_GLYPH_CLASS_GET; - /* it it is an outline too */ + /* if it is an outline */ else if ( slot->format == FT_GLYPH_FORMAT_OUTLINE ) clazz = FT_OUTLINE_GLYPH_CLASS_GET; @@ -515,6 +515,10 @@ const FT_Glyph_Class* clazz; +#ifdef FT_CONFIG_OPTION_PIC + FT_Library library = FT_GLYPH( glyph )->library; +#endif + /* check argument */ if ( !the_glyph ) |