diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 14:12:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 14:12:40 +0000 |
| commit | 83fa9a9811e2c18cffd83a020757f7fb51ffddaa (patch) | |
| tree | d71b6212a53834b53334c3bd14c63eeafd88ad20 /freetype/src/psaux/t1decode.c | |
| parent | 1d59691fe77c20ecb010ea8589a940c4ea6ac356 (diff) | |
| download | vcxsrv-83fa9a9811e2c18cffd83a020757f7fb51ffddaa.tar.gz vcxsrv-83fa9a9811e2c18cffd83a020757f7fb51ffddaa.tar.bz2 vcxsrv-83fa9a9811e2c18cffd83a020757f7fb51ffddaa.zip | |
Updated to following packages:
freetype-2.3.12
Diffstat (limited to 'freetype/src/psaux/t1decode.c')
| -rw-r--r-- | freetype/src/psaux/t1decode.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/freetype/src/psaux/t1decode.c b/freetype/src/psaux/t1decode.c index b3245a678..31554ff1b 100644 --- a/freetype/src/psaux/t1decode.c +++ b/freetype/src/psaux/t1decode.c @@ -4,7 +4,8 @@ /* */ /* PostScript Type 1 decoding routines (body). */ /* */ -/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 */ +/* 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -211,7 +212,12 @@ /* `glyph_names' is set to 0 for CID fonts which do not */ /* include an encoding. How can we deal with these? */ +#ifdef FT_CONFIG_OPTION_INCREMENTAL + if ( decoder->glyph_names == 0 && + !face->root.internal->incremental_interface ) +#else if ( decoder->glyph_names == 0 ) +#endif /* FT_CONFIG_OPTION_INCREMENTAL */ { FT_ERROR(( "t1operator_seac:" " glyph names table not available in this font\n" )); @@ -1453,12 +1459,20 @@ case op_setcurrentpoint: FT_TRACE4(( " setcurrentpoint" )); - /* From the T1 specs, section 6.4: */ + /* From the T1 specification, section 6.4: */ /* */ /* The setcurrentpoint command is used only in */ /* conjunction with results from OtherSubrs procedures. */ - /* known_othersubr_result_cnt != 0 is already handled above */ + /* known_othersubr_result_cnt != 0 is already handled */ + /* above. */ + + /* Note, however, that both Ghostscript and Adobe */ + /* Distiller handle this situation by silently ignoring */ + /* the inappropriate `setcurrentpoint' instruction. So */ + /* we do the same. */ +#if 0 + if ( decoder->flex_state != 1 ) { FT_ERROR(( "t1_decoder_parse_charstrings:" @@ -1466,6 +1480,7 @@ goto Syntax_Error; } else +#endif decoder->flex_state = 0; break; |