minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

A missing Unicode cmap is not a fatal error. 

This is a follow-up to the previous commit.

* src/cff/cffobjs.c (cff_face_init), src/sfnt/sfobjs.c
(sfnt_load_face), src/type1/t1objs.c (T1_Face_Init),
src/type42/t42objs.c (T42_Face_Init): Implement it.
This commit is contained in:
Werner Lemberg 2018-10-07 09:28:52 +02:00
parent 885f5b0b4e
commit 912e174c66
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2018-10-07 Werner Lemberg <wl@gnu.org>
A missing Unicode cmap is not a fatal error.
This is a follow-up to the previous commit.
* src/cff/cffobjs.c (cff_face_init), src/sfnt/sfobjs.c
(sfnt_load_face), src/type1/t1objs.c (T1_Face_Init),
src/type42/t42objs.c (T42_Face_Init): Implement it.
2018-10-07 Werner Lemberg <wl@gnu.org>
Fix handling of FT_CONFIG_OPTION_ADOBE_GLYPH_LIST (#54794).

3
src/cff/cffobjs.c
View File

@ -1072,7 +1072,8 @@
error = FT_CMap_New( &cff_cmap_unicode_class_rec, NULL,
&cmaprec, NULL );
if ( error &&
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) )
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
FT_ERR_NEQ( error, Unimplemented_Feature ) )
goto Exit;
error = FT_Err_Ok;

3
src/sfnt/sfobjs.c
View File

@ -1531,7 +1531,8 @@
error = FT_CMap_New( (FT_CMap_Class)&tt_cmap_unicode_class_rec,
NULL, &cmaprec, NULL );
if ( error &&
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) )
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
FT_ERR_NEQ( error, Unimplemented_Feature ) )
goto Exit;
error = FT_Err_Ok;

3
src/type1/t1objs.c
View File

@ -526,7 +526,8 @@
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
if ( error &&
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) )
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
FT_ERR_NEQ( error, Unimplemented_Feature ) )
goto Exit;
error = FT_Err_Ok;

3
src/type42/t42objs.c
View File

@ -354,7 +354,8 @@
error = FT_CMap_New( cmap_classes->unicode, NULL, &charmap, NULL );
if ( error &&
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) )
FT_ERR_NEQ( error, No_Unicode_Glyph_Name ) &&
FT_ERR_NEQ( error, Unimplemented_Feature ) )
goto Exit;
error = FT_Err_Ok;