Fix another case reported in Savannah bug #30373.
Permit a face for Type1, Type42 and CFF without charmap, patch by Tor Andersson. * src/type1/t1objs.c (T1_Face_Init): Reset the error if it is FT_Err_No_Unicode_Glyph_Name. * src/type42/t42objs.c (T42_Face_Init): Ditto. * src/cff/cffobjs.c (cff_face_init): Ditto.
This commit is contained in:
parent
84fa62e0d7
commit
d594202ebb
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2010-07-10 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
Fix another case reported in Savannah bug #30373.
|
||||||
|
Permit a face for Type1, Type42 and CFF without charmap,
|
||||||
|
patch by Tor Andersson.
|
||||||
|
|
||||||
|
* src/type1/t1objs.c (T1_Face_Init): Reset the error if it
|
||||||
|
is FT_Err_No_Unicode_Glyph_Name.
|
||||||
|
* src/type42/t42objs.c (T42_Face_Init): Ditto.
|
||||||
|
* src/cff/cffobjs.c (cff_face_init): Ditto.
|
||||||
|
|
||||||
2010-07-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2010-07-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
Use defined macros to set {platform,encoding}_id.
|
Use defined macros to set {platform,encoding}_id.
|
||||||
|
|
|
@ -902,6 +902,7 @@
|
||||||
&cmaprec, NULL );
|
&cmaprec, NULL );
|
||||||
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
error = FT_Err_Ok;
|
||||||
|
|
||||||
/* if no Unicode charmap was previously selected, select this one */
|
/* if no Unicode charmap was previously selected, select this one */
|
||||||
if ( cffface->charmap == NULL && nn != (FT_UInt)cffface->num_charmaps )
|
if ( cffface->charmap == NULL && nn != (FT_UInt)cffface->num_charmaps )
|
||||||
|
|
|
@ -501,6 +501,7 @@
|
||||||
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
|
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
|
||||||
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
error = FT_Err_Ok;
|
||||||
|
|
||||||
/* now, generate an Adobe Standard encoding when appropriate */
|
/* now, generate an Adobe Standard encoding when appropriate */
|
||||||
charmap.platform_id = TT_PLATFORM_ADOBE;
|
charmap.platform_id = TT_PLATFORM_ADOBE;
|
||||||
|
|
|
@ -338,6 +338,7 @@
|
||||||
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
|
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
|
||||||
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
if ( error && FT_Err_No_Unicode_Glyph_Name != error )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
error = FT_Err_Ok;
|
||||||
|
|
||||||
/* now, generate an Adobe Standard encoding when appropriate */
|
/* now, generate an Adobe Standard encoding when appropriate */
|
||||||
charmap.platform_id = TT_PLATFORM_ADOBE;
|
charmap.platform_id = TT_PLATFORM_ADOBE;
|
||||||
|
|
Loading…
Reference in New Issue