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

[color] Rely on CPALV1Tail Null object

This commit is contained in:
Behdad Esfahbod 2018-10-22 16:30:30 -07:00
parent d7865107ea
commit 14474d2104
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,31 +125,13 @@ struct CPAL
inline unsigned int get_color_count () const { return numColors; } inline unsigned int get_color_count () const { return numColors; }
inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette_index) const inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette_index) const
{ { return v1 ().get_palette_flags (this, palette_index, numPalettes); }
if (unlikely (version == 0))
return HB_OT_COLOR_PALETTE_FLAG_DEFAULT;
const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
return cpal1.get_palette_flags (this, palette_index, numPalettes);
}
inline unsigned int get_palette_name_id (unsigned int palette_index) const inline unsigned int get_palette_name_id (unsigned int palette_index) const
{ { return v1 ().get_palette_name_id (this, palette_index, numPalettes); }
if (unlikely (version == 0))
return HB_NAME_ID_INVALID;
const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
return cpal1.get_palette_name_id (this, palette_index, numPalettes);
}
inline unsigned int get_color_name_id (unsigned int color_index) const inline unsigned int get_color_name_id (unsigned int color_index) const
{ { return v1 ().get_color_name_id (this, color_index, numColors); }
if (unlikely (version == 0))
return HB_NAME_ID_INVALID;
const CPALV1Tail& cpal1 = StructAfter<CPALV1Tail> (*this);
return cpal1.get_color_name_id (this, color_index, numColors);
}
bool bool
get_color_record_argb (unsigned int color_index, unsigned int palette_index, hb_color_t* color) const get_color_record_argb (unsigned int color_index, unsigned int palette_index, hb_color_t* color) const
@ -164,14 +146,22 @@ struct CPAL
return true; return true;
} }
private:
inline const CPALV1Tail& v1 (void) const
{
if (version == 0) return Null(CPALV1Tail);
return StructAfter<CPALV1Tail> (*this);
}
public:
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
if (unlikely (!(c->check_struct (this) && /* it checks colorRecordIndices also if (unlikely (!(c->check_struct (this) &&
* See #get_size */
(this+colorRecordsZ).sanitize (c, numColorRecords)))) (this+colorRecordsZ).sanitize (c, numColorRecords))))
return_trace (false); return_trace (false);
/* TODO */
/* Check for indices sanity so no need for doing it runtime */ /* Check for indices sanity so no need for doing it runtime */
for (unsigned int i = 0; i < numPalettes; ++i) for (unsigned int i = 0; i < numPalettes; ++i)
if (unlikely (colorRecordIndicesZ[i] + numColors > numColorRecords)) if (unlikely (colorRecordIndicesZ[i] + numColors > numColorRecords))
@ -181,8 +171,7 @@ struct CPAL
if (version == 0) if (version == 0)
return_trace (true); return_trace (true);
const CPALV1Tail &v1 = StructAfter<CPALV1Tail> (*this); return_trace (likely (v1 ().sanitize (c, this, numPalettes, numColors)));
return_trace (likely (v1.sanitize (c, this, numPalettes, numColors)));
} }
protected: protected: