diff options
author | Werner Lemberg <wl@gnu.org> | 2018-07-02 11:50:04 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2018-07-02 11:50:04 +0200 |
commit | 7edc937fe679d14d66f55cf6f7fa607925d38f3c (patch) | |
tree | 012f41718031cb5b4a66848a44cf678458dd17ef /src/sfnt | |
parent | 4e3b2473d8ca08c9001e4605ba9844168811d2c7 (diff) | |
download | freetype2-7edc937fe679d14d66f55cf6f7fa607925d38f3c.tar.gz |
s/palette_types/palette_flags/.
Suggested by Behdad.
Diffstat (limited to 'src/sfnt')
-rw-r--r-- | src/sfnt/sfobjs.c | 2 | ||||
-rw-r--r-- | src/sfnt/ttcolr.c | 4 | ||||
-rw-r--r-- | src/sfnt/ttcpal.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 5dc41b4a3..7777db148 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -1814,7 +1814,7 @@ /* freeing glyph color palette data */ FT_FREE( face->palette_data.palette_name_ids ); - FT_FREE( face->palette_data.palette_types ); + FT_FREE( face->palette_data.palette_flags ); FT_FREE( face->palette_data.palette_entry_name_ids ); FT_FREE( face->palette ); diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c index 9151ab5fa..977e149b6 100644 --- a/src/sfnt/ttcolr.c +++ b/src/sfnt/ttcolr.c @@ -375,8 +375,8 @@ } else { - if ( face->palette_data.palette_types && - ( face->palette_data.palette_types[face->palette_index] & + if ( face->palette_data.palette_flags && + ( face->palette_data.palette_flags[face->palette_index] & FT_PALETTE_FOR_DARK_BACKGROUND ) ) { /* white opaque */ diff --git a/src/sfnt/ttcpal.c b/src/sfnt/ttcpal.c index 9cdcec69c..f01d88c63 100644 --- a/src/sfnt/ttcpal.c +++ b/src/sfnt/ttcpal.c @@ -155,7 +155,7 @@ while ( q < limit ) *q++ = FT_NEXT_USHORT( p ); - face->palette_data.palette_types = array; + face->palette_data.palette_flags = array; } if ( label_offset ) |