diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-06-12 06:37:02 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-06-13 06:11:27 +0200 |
| commit | 7de877bbc6282c820fcf18262ec4c7bb7dcccc33 (patch) | |
| tree | 306dc45d3676482f60ccdd29ab7c4ddaf5a1b2b9 | |
| parent | 04338a5e52d19529e4fe77cd370d1235592ba7e1 (diff) | |
| download | freetype2-7de877bbc6282c820fcf18262ec4c7bb7dcccc33.tar.gz | |
[sfnt] Minor.
* src/sfnt/ttcolr.c (tt_face_load_colr_layers):
s/palette_index/palette_entry_index/ for consistency.
Adjust return error code in case of error.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/sfnt/ttcolr.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2018-06-12 Werner Lemberg <wl@gnu.org> + + [sfnt] Minor. + + * src/sfnt/ttcolr.c (tt_face_load_colr_layers): + s/palette_index/palette_entry_index/ for consistency. + Adjust return error code in case of error. + 2018-06-11 Alexei Podtelezhnikov <apodtele@gmail.com> [raster] Clean up. diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c index 64e8b257d..8e232c3fb 100644 --- a/src/sfnt/ttcolr.c +++ b/src/sfnt/ttcolr.c @@ -400,18 +400,18 @@ for ( layer_idx = 0; layer_idx < glyph_record.num_layers; layer_idx++ ) { - FT_UShort gid = FT_NEXT_USHORT( layer_record_ptr ); - FT_UShort palette_index = FT_NEXT_USHORT( layer_record_ptr ); + FT_UShort gid = FT_NEXT_USHORT( layer_record_ptr ); + FT_UShort palette_entry_index = FT_NEXT_USHORT( layer_record_ptr ); - if ( palette_index != 0xFFFF && - palette_index >= face->palette_data.num_palette_entries ) + if ( palette_entry_index != 0xFFFF && + palette_entry_index >= face->palette_data.num_palette_entries ) { - error = FT_THROW( Invalid_File_Format ); + error = FT_THROW( Invalid_Table ); goto Error; } - layers[layer_idx].color_index = palette_index; + layers[layer_idx].color_index = palette_entry_index; layers[layer_idx].glyph_index = gid; } |