diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-10-07 09:28:52 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-10-07 09:28:52 +0200 |
| commit | 912e174c662043672f18d52bbec09fa80a1f2d42 (patch) | |
| tree | e53da82d191c3151b111cb379677e6aeba3aa419 | |
| parent | 885f5b0b4edb0c00a48af3eabe98507cf4f94430 (diff) | |
| download | freetype2-912e174c662043672f18d52bbec09fa80a1f2d42.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/cff/cffobjs.c | 3 | ||||
| -rw-r--r-- | src/sfnt/sfobjs.c | 3 | ||||
| -rw-r--r-- | src/type1/t1objs.c | 3 | ||||
| -rw-r--r-- | src/type42/t42objs.c | 3 |
5 files changed, 18 insertions, 4 deletions
@@ -1,5 +1,15 @@ 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). * src/cff/cffcmap.c (cff_cmap_unicode_init), src/psaux/t1cmap.c diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 9c27b5238..90de7f85d 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -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; diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index a54335dc5..375f35eb9 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -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; diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 6cc5ff9ee..ac9070994 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -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; diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index 0b265ce1a..991f6041c 100644 --- a/src/type42/t42objs.c +++ b/src/type42/t42objs.c @@ -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; |