diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-05-15 21:24:04 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-05-15 21:24:04 +0200 |
| commit | 6e5445a232cbdbf18a45629cf2f12a81c043607f (patch) | |
| tree | 10c8f7aaceb9e634cb49089a374d10d24aad5cc0 | |
| parent | a7f276a281b2741b14beadb00f5d8414c464e07c (diff) | |
| download | freetype2-6e5445a232cbdbf18a45629cf2f12a81c043607f.tar.gz | |
[truetype] Fix error handling for embedded bitmaps.
Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>.
* src/truetype/ttgload.c (TT_Load_Glyph)
[TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Handle error if font is not
scalable.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/truetype/ttgload.c | 8 |
2 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2017-05-15 Werner Lemberg <wl@gnu.org> + + [truetype] Fix error handling for embedded bitmaps. + + Problem reported by Hin-Tak Leung <htl10@users.sourceforge.net>. + + * src/truetype/ttgload.c (TT_Load_Glyph) + [TT_CONFIG_OPTION_EMBEDDED_BITMAPS]: Handle error if font is not + scalable. + 2017-05-15 Alexei Podtelezhnikov <apodtele@gmail.com> [autofit] Make autohint warping NORMAL option. diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index b7a844a6c..68a9b4ad5 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -2621,7 +2621,13 @@ IS_DEFAULT_INSTANCE ) { error = load_sbit_image( size, glyph, glyph_index, load_flags ); - if ( !error ) + if ( error ) + { + /* return error if font is not scalable */ + if ( !FT_IS_SCALABLE( glyph->face ) ) + return error; + } + else { if ( FT_IS_SCALABLE( glyph->face ) ) { |