rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Werner Lemberg 2018-06-12 06:37:02 +02:00
parent 04338a5e52
commit 7de877bbc6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

12
src/sfnt/ttcolr.c
View File

@ -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;
}