summaryrefslogtreecommitdiff
path: root/src/psaux/psft.c
diff options
context:
space:
mode:
authorEwald Hew <ewaldhew@gmail.com>2017-08-25 10:13:46 +0800
committerEwald Hew <ewaldhew@gmail.com>2017-08-25 10:20:40 +0800
commit4fedbbe1308fb850af2db27bbbe86becf2ee6adc (patch)
treed1c169b25f0eca6c831923b3d649d71166c5764f /src/psaux/psft.c
parentfd7441a3b7e194d94c8ac018313a02575f006a3a (diff)
downloadfreetype2-ewaldhew-cleaned.tar.gz
[psaux] Minor fixes.ewaldhew-cleaned
* include/freetype/internal/psaux.h, src/psaux/psobjs.{c,h}: Rearrange ps_builder_init arguments to conventional order. * src/psaux/psft.c (cf2_decoder_parse_charstrings): Add a check and notice for SubFont in Type 1 mode.
Diffstat (limited to 'src/psaux/psft.c')
-rw-r--r--src/psaux/psft.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/psaux/psft.c b/src/psaux/psft.c
index fd09414d8..89e168a94 100644
--- a/src/psaux/psft.c
+++ b/src/psaux/psft.c
@@ -315,6 +315,13 @@
FT_ASSERT( decoder &&
( is_t1 || decoder->cff ) );
+ if ( is_t1 && !decoder->current_subfont )
+ {
+ FT_ERROR(( "cf2_decoder_parse_charstrings (Type 1): "
+ "SubFont missing. Use `t1_make_subfont' first\n" ));
+ return FT_THROW( Invalid_Table );
+ }
+
memory = decoder->builder.memory;
/* CF2 data is saved here across glyphs */