walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[color] Rename vars in CPAL

This commit is contained in:
Behdad Esfahbod 2018-10-22 14:43:12 -07:00
parent 0babf761c9
commit 3600d20603
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hb-ot-color-cpal-table.hh
View File

@ -49,34 +49,34 @@ struct CPALV1Tail
inline bool inline bool
sanitize (hb_sanitize_context_t *c, const void *base, sanitize (hb_sanitize_context_t *c, const void *base,
unsigned int palettes, unsigned int paletteEntries) const unsigned int palette_count, unsigned int paletteEntries) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
(base+paletteFlagsZ).sanitize (c, palettes) && (base+paletteFlagsZ).sanitize (c, palette_count) &&
(base+paletteLabelZ).sanitize (c, palettes) && (base+paletteLabelZ).sanitize (c, palette_count) &&
(base+paletteEntryLabelZ).sanitize (c, paletteEntries)); (base+paletteEntryLabelZ).sanitize (c, paletteEntries));
} }
private: private:
inline hb_ot_color_palette_flags_t inline hb_ot_color_palette_flags_t
get_palette_flags (const void *base, unsigned int palette, get_palette_flags (const void *base, unsigned int palette_index,
unsigned int palettes_count) const unsigned int palettes_count) const
{ {
if (unlikely (palette >= palettes_count)) if (unlikely (palette_index >= palettes_count))
return HB_OT_COLOR_PALETTE_FLAG_DEFAULT; return HB_OT_COLOR_PALETTE_FLAG_DEFAULT;
return (hb_ot_color_palette_flags_t) (uint32_t) (base+paletteFlagsZ)[palette]; return (hb_ot_color_palette_flags_t) (uint32_t) (base+paletteFlagsZ)[palette_index];
} }
inline unsigned int inline unsigned int
get_palette_name_id (const void *base, unsigned int palette, get_palette_name_id (const void *base, unsigned int palette_index,
unsigned int palettes_count) const unsigned int palettes_count) const
{ {
if (unlikely (palette >= palettes_count)) if (unlikely (palette_index >= palettes_count))
return HB_NAME_ID_INVALID; return HB_NAME_ID_INVALID;
return (base+paletteLabelZ)[palette]; return (base+paletteLabelZ)[palette_index];
} }
inline unsigned int inline unsigned int
@ -140,22 +140,22 @@ struct CPAL
return min_size + numPalettes * sizeof (HBUINT16); return min_size + numPalettes * sizeof (HBUINT16);
} }
inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette) const inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette_index) const
{ {
if (unlikely (version == 0)) if (unlikely (version == 0))
return HB_OT_COLOR_PALETTE_FLAG_DEFAULT; return HB_OT_COLOR_PALETTE_FLAG_DEFAULT;
const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this); const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
return cpal1.get_palette_flags (this, palette, numPalettes); return cpal1.get_palette_flags (this, palette_index, numPalettes);
} }
inline unsigned int get_palette_name_id (unsigned int palette) const inline unsigned int get_palette_name_id (unsigned int palette_index) const
{ {
if (unlikely (version == 0)) if (unlikely (version == 0))
return HB_NAME_ID_INVALID; return HB_NAME_ID_INVALID;
const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this); const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
return cpal1.get_palette_name_id (this, palette, numPalettes); return cpal1.get_palette_name_id (this, palette_index, numPalettes);
} }
inline unsigned int get_palette_entry_name_id (unsigned int palette_entry) const inline unsigned int get_palette_entry_name_id (unsigned int palette_entry) const
@ -174,15 +174,15 @@ struct CPAL
{ return numPaletteEntries; } { return numPaletteEntries; }
bool bool
get_color_record_argb (unsigned int color_index, unsigned int palette, hb_color_t* color) const get_color_record_argb (unsigned int color_index, unsigned int palette_index, hb_color_t* color) const
{ {
if (unlikely (color_index >= numPaletteEntries || palette >= numPalettes)) if (unlikely (color_index >= numPaletteEntries || palette_index >= numPalettes))
return false; return false;
/* No need for more range check as it is already done on #sanitize */ /* No need for more range check as it is already done on #sanitize */
const UnsizedArrayOf<BGRAColor>& color_records = this+colorRecordsZ; const UnsizedArrayOf<BGRAColor>& color_records = this+colorRecordsZ;
if (color) if (color)
*color = color_records[colorRecordIndicesZ[palette] + color_index]; *color = color_records[colorRecordIndicesZ[palette_index] + color_index];
return true; return true;
} }

1
src/hb-ot-color.cc
View File

@ -77,6 +77,7 @@ _get_svg (hb_face_t *face)
} }
#endif #endif
/* /*
* CPAL * CPAL
*/ */