diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2010-07-09 11:36:00 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2010-07-09 20:50:34 +0900 |
| commit | b8ca6de3653b5c3d50e9fadc6a1d7b606deffbdb (patch) | |
| tree | 0e9b0a9fb5cb2338a16522d8beefe8bcbf896d27 /src/psnames | |
| parent | 603d1218724055f538e2f36d7e74454b1a44cc12 (diff) | |
| download | freetype2-b8ca6de3653b5c3d50e9fadc6a1d7b606deffbdb.tar.gz | |
Fix Savannah bug #30373.
Too serious check of errors by `FT_CMap_New' since 2010-07-04
is fixed. Reported by Tor Andersson.
* include/freetype/fterrdef.h
(PSnames_Err_No_Unicode_Glyph_Name): New error code to
indicate the Unicode charmap synthesis failed because
no Unicode glyph name is found.
* src/psnames/psmodule.c (ps_unicodes_init): Return
PSnames_Err_No_Unicode_Glyph_Name when no Unicode glyph name
is found in the font.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Return
CFF_Err_No_Unicode_Glyph_Name when no SID is available.
* src/type1/t1objs.c (T1_Face_Init): Proceed if `FT_CMap_New'
is failed by the lack of Unicode glyph name.
* src/type42/t42objs.c (T42_Face_Init): Ditto.
* src/cff/cffobjs.c (cff_face_init): Ditto.
Diffstat (limited to 'src/psnames')
| -rw-r--r-- | src/psnames/psmodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index fb3b29ce4..752869693 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -366,9 +366,10 @@ if ( count == 0 ) { + /* No unicode chars here! */ FT_FREE( table->maps ); if ( !error ) - error = PSnames_Err_Invalid_Argument; /* No unicode chars here! */ + error = PSnames_Err_No_Unicode_Glyph_Name; } else { |