From a8ceae4008db225cbe388a4b773f7010162907c7 Mon Sep 17 00:00:00 2001 From: Eugen Sawin Date: Sat, 8 Feb 2014 06:30:06 +0100 Subject: [PATCH] Fix Savannah bug #41507. * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) [!FT_CONFIG_OPTION_USE_PNG] <17, 17, 19>: Fix error handling. --- ChangeLog | 7 +++++++ src/sfnt/ttsbit.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b4ae71801..0f43c0450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-02-08 Eugen Sawin + + Fix Savannah bug #41507. + + * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) + [!FT_CONFIG_OPTION_USE_PNG] <17, 17, 19>: Fix error handling. + 2014-02-08 Dave Arnold [cff] Fix minor performance bug. diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index cd671d926..c118894a4 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -1016,10 +1016,11 @@ case 19: /* metrics in EBLC, PNG image data */ #ifdef FT_CONFIG_OPTION_USE_PNG loader = tt_sbit_decoder_load_png; + break; #else error = FT_THROW( Unimplemented_Feature ); + goto Fail; #endif /* FT_CONFIG_OPTION_USE_PNG */ - break; default: error = FT_THROW( Invalid_Table );