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

[sbix] Simplify ppem access 

If struct members are simple and needed publicly, we make them public.
This commit is contained in:
Behdad Esfahbod 2018-10-28 15:44:40 -07:00
parent 6ac9a4eaa3
commit 4e0ee2af09
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-ot-color-sbix-table.hh
View File

@ -69,9 +69,6 @@ struct SBIXStrike
imageOffsetsZ.sanitize_shallow (c, c->get_num_glyphs () + 1)); imageOffsetsZ.sanitize_shallow (c, c->get_num_glyphs () + 1));
} }
inline unsigned int get_ppem () const { return ppem; }
inline unsigned int get_resolution () const { return resolution; }
inline hb_blob_t *get_glyph_blob (unsigned int glyph_id, inline hb_blob_t *get_glyph_blob (unsigned int glyph_id,
hb_blob_t *sbix_blob, hb_blob_t *sbix_blob,
hb_tag_t file_type, hb_tag_t file_type,
@ -115,10 +112,11 @@ struct SBIXStrike
return hb_blob_create_sub_blob (sbix_blob, glyph_offset, glyph_length); return hb_blob_create_sub_blob (sbix_blob, glyph_offset, glyph_length);
} }
protected: public:
HBUINT16 ppem; /* The PPEM size for which this strike was designed. */ HBUINT16 ppem; /* The PPEM size for which this strike was designed. */
HBUINT16 resolution; /* The device pixel density (in PPI) for which this HBUINT16 resolution; /* The device pixel density (in PPI) for which this
* strike was designed. (E.g., 96 PPI, 192 PPI.) */ * strike was designed. (E.g., 96 PPI, 192 PPI.) */
protected:
UnsizedArrayOf<LOffsetTo<SBIXGlyph> > UnsizedArrayOf<LOffsetTo<SBIXGlyph> >
imageOffsetsZ; /* Offset from the beginning of the strike data header imageOffsetsZ; /* Offset from the beginning of the strike data header
* to bitmap data for an individual glyph ID. */ * to bitmap data for an individual glyph ID. */
@ -184,11 +182,11 @@ struct sbix
requested_ppem = 1<<30; /* Choose largest strike. */ requested_ppem = 1<<30; /* Choose largest strike. */
/* TODO Add DPI sensitivity as well? */ /* TODO Add DPI sensitivity as well? */
unsigned int best_i = 0; unsigned int best_i = 0;
unsigned int best_ppem = (table+table->strikes[0]).get_ppem (); unsigned int best_ppem = (table+table->strikes[0]).ppem;
for (unsigned int i = 1; i < table->strikes.len; i++) for (unsigned int i = 1; i < table->strikes.len; i++)
{ {
unsigned int ppem = (table+table->strikes[i]).get_ppem (); unsigned int ppem = (table+table->strikes[i]).ppem;
if ((requested_ppem <= ppem && ppem < best_ppem) || if ((requested_ppem <= ppem && ppem < best_ppem) ||
(requested_ppem > best_ppem && ppem > best_ppem)) (requested_ppem > best_ppem && ppem > best_ppem))
{ {