diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-05-16 20:37:43 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-05-16 21:21:18 +0200 |
| commit | 583dabf2918cc9ca82cac0b16482d2c56de8c3fa (patch) | |
| tree | 6b47163ed3dd4a631a23b526dc6fb252e729d47f /src/sfnt | |
| parent | f1458d2e44d89e8bc7c0db068f1cbc54b74b9d98 (diff) | |
| download | freetype2-583dabf2918cc9ca82cac0b16482d2c56de8c3fa.tar.gz | |
Add function `FT_Get_GlyphLayers' to access `COLR' table data.
* include/freetype/internal/ftobjs.h (FT_Glyph_LayerRec): Move this
structure to...
* include/freetype/freetype.h (FT_Glyph_LayerRec): ... this
header file.
(FT_Glyph_Layer): New typedef.
Update code to use it where appropriate.
* src/base/ftobjs.c (FT_Get_GlyphLayers): New function.
Diffstat (limited to 'src/sfnt')
| -rw-r--r-- | src/sfnt/ttcolr.c | 16 | ||||
| -rw-r--r-- | src/sfnt/ttcolr.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c index 67d320b11..24d350e6c 100644 --- a/src/sfnt/ttcolr.c +++ b/src/sfnt/ttcolr.c @@ -290,10 +290,10 @@ FT_LOCAL_DEF( FT_Error ) - tt_face_load_colr_layers( TT_Face face, - FT_Int glyph_id, - FT_Glyph_LayerRec* *ret_layers, - FT_UShort* ret_num_layers ) + tt_face_load_colr_layers( TT_Face face, + FT_Int glyph_id, + FT_Glyph_Layer *ret_layers, + FT_UShort* ret_num_layers ) { FT_Error error; FT_Memory memory = face->root.memory; @@ -302,10 +302,10 @@ Colr* colr = &colr_and_cpal->colr; Cpal* cpal = &colr_and_cpal->cpal; - BaseGlyphRecord glyph_record; - FT_Glyph_LayerRec* layers; - int layer_idx; - FT_Byte* layer_record_ptr; + BaseGlyphRecord glyph_record; + FT_Glyph_Layer layers; + int layer_idx; + FT_Byte* layer_record_ptr; if ( !ret_layers || !ret_num_layers ) diff --git a/src/sfnt/ttcolr.h b/src/sfnt/ttcolr.h index 84062c04b..1c58153a5 100644 --- a/src/sfnt/ttcolr.h +++ b/src/sfnt/ttcolr.h @@ -37,10 +37,10 @@ FT_BEGIN_HEADER tt_face_free_colr( TT_Face face ); FT_LOCAL( FT_Error ) - tt_face_load_colr_layers( TT_Face face, - FT_Int glyph_id, - FT_Glyph_LayerRec* *ret_layers, - FT_UShort* ret_num_layers ); + tt_face_load_colr_layers( TT_Face face, + FT_Int glyph_id, + FT_Glyph_Layer *ret_layers, + FT_UShort* ret_num_layers ); FT_LOCAL( FT_Error ) tt_face_colr_blend_layer( TT_Face face, |