Commit 2dd20916117e36a49b52206ceb6689eae5060c58
2018-05-15T09:05:53
[sfnt] If `COLR' is present, don't assume that all glyphs use it. * src/sfnt/ttcolr.c (tt_face_load_colr_layers): Return FT_Err_Ok if current glyph is not a `COLR' base glyph. * src/truetype/ttgload.c (TT_Load_Glyph): Don't allocate `color_layers' if there are no color layers.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/ChangeLog b/ChangeLog
index be867e8..1a787b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-05-15 Werner Lemberg <wl@gnu.org>
+
+ [sfnt] If `COLR' is present, don't assume that all glyphs use it.
+
+ * src/sfnt/ttcolr.c (tt_face_load_colr_layers): Return FT_Err_Ok if
+ current glyph is not a `COLR' base glyph.
+
+ * src/truetype/ttgload.c (TT_Load_Glyph): Don't allocate
+ `color_layers' if there are no color layers.
+
2018-05-14 Werner Lemberg <wl@gnu.org>
* src/base/ftobjs.c (FT_Load_Glyph): Fix signature of `pixel_modes'.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 3590ce1..c102bbe 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4526,7 +4526,7 @@
break;
default:
- if ( slot->internal->color_layers != NULL )
+ if ( slot->internal->color_layers )
{
FT_Face face = slot->face;
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 58499d3..1e469f5 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -315,7 +315,12 @@
colr->num_base_glyphs,
glyph_id,
&glyph_record ) )
- return FT_THROW ( Invalid_Table );
+ {
+ *ret_layers = NULL;
+ *ret_num_layers = 0;
+
+ return FT_Err_Ok;
+ }
/* Load all colors for the glyphs; this would be stored in the slot. */
layer_record_ptr = colr->layers +
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 17d8d95..459fe2e 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -2913,14 +2913,17 @@
if ( error )
return error;
- if ( FT_NEW( color_layers ) )
- return error;
+ if ( num_glyph_layers )
+ {
+ if ( FT_NEW( color_layers ) )
+ return error;
- color_layers->layers = glyph_layers;
- color_layers->num_layers = num_glyph_layers;
- color_layers->load_flags = load_flags;
+ color_layers->layers = glyph_layers;
+ color_layers->num_layers = num_glyph_layers;
+ color_layers->load_flags = load_flags;
- glyph->internal->color_layers = color_layers;
+ glyph->internal->color_layers = color_layers;
+ }
}
Exit: