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

[color/COLR] Clean up

This commit is contained in:
Behdad Esfahbod 2018-03-14 16:03:01 +01:00
parent 9e337341d5
commit 399c800b93
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,8 +48,8 @@ struct LayerRecord
} }
protected: protected:
GlyphID gID; /* Glyph ID of layer glyph */ GlyphID glyphid; /* Glyph ID of layer glyph */
HBUINT16 paletteIndex; /* Index value to use with a selected color palette */ HBUINT16 colorIdx; /* Index value to use with a selected color palette */
public: public:
DEFINE_SIZE_STATIC (4); DEFINE_SIZE_STATIC (4);
}; };
@ -65,9 +65,9 @@ struct BaseGlyphRecord
} }
protected: protected:
GlyphID gID; /* Glyph ID of reference glyph */ GlyphID glyphid; /* Glyph ID of reference glyph */
HBUINT16 firstLayerIndex; /* Index to the layer record */ HBUINT16 firstLayerIdx; /* Index to the layer record */
HBUINT16 numLayers; /* Number of color layers associated with this glyph */ HBUINT16 numLayers; /* Number of color layers associated with this glyph */
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
}; };
@ -86,29 +86,30 @@ struct COLR
const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this); const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this);
for (unsigned int i = 0; i < numBaseGlyphRecords; ++i) for (unsigned int i = 0; i < numBaseGlyphRecords; ++i)
if (base_glyph_records[i].firstLayerIndex + if (base_glyph_records[i].firstLayerIdx +
base_glyph_records[i].numLayers > numLayerRecords) base_glyph_records[i].numLayers > numLayerRecords)
return_trace (false); return_trace (false);
return_trace (true); return_trace (true);
} }
inline bool get_base_glyph_record ( inline bool get_base_glyph_record (hb_codepoint_t glyph_id,
hb_codepoint_t glyph_id, unsigned int &first_layer, unsigned int &num_layers) const unsigned int &first_layer,
unsigned int &num_layers) const
{ {
const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this); const BaseGlyphRecord* base_glyph_records = &baseGlyphRecordsZ (this);
unsigned int min = 0, max = numBaseGlyphRecords - 1; unsigned int min = 0, max = numBaseGlyphRecords - 1;
while (min <= max) while (min <= max)
{ {
unsigned int mid = (min + max) / 2; unsigned int mid = (min + max) / 2;
hb_codepoint_t gID = base_glyph_records[mid].gID; hb_codepoint_t glyphid = base_glyph_records[mid].glyphid;
if (gID > glyph_id) if (glyphid > glyph_id)
max = mid - 1; max = mid - 1;
else if (gID < glyph_id) else if (glyphid < glyph_id)
min = mid + 1; min = mid + 1;
else else
{ {
first_layer = base_glyph_records[mid].firstLayerIndex; first_layer = base_glyph_records[mid].firstLayerIdx;
num_layers = base_glyph_records[mid].numLayers; num_layers = base_glyph_records[mid].numLayers;
return true; return true;
} }
@ -117,11 +118,12 @@ struct COLR
} }
inline void get_layer_record (int layer, inline void get_layer_record (int layer,
hb_codepoint_t &glyph_id, unsigned int &palette_index) const hb_codepoint_t &glyph_id,
unsigned int &palette_index) const
{ {
const LayerRecord* records = &layerRecordsOffsetZ (this); const LayerRecord* records = &layerRecordsOffsetZ (this);
glyph_id = records[layer].gID; glyph_id = records[layer].glyphid;
palette_index = records[layer].paletteIndex; palette_index = records[layer].colorIdx;
} }
protected: protected: