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

[cbdt] Simplify more

This commit is contained in:
Behdad Esfahbod 2018-10-28 23:07:59 -07:00
parent 574579d376
commit 8cffee0577
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hb-ot-color-cbdt-table.hh
View File

@ -343,20 +343,14 @@ struct CBLC
} }
protected: protected:
const BitmapSizeTable &choose_strike (hb_font_t *font, const BitmapSizeTable &choose_strike (hb_font_t *font) const
unsigned int *x_ppem, unsigned int *y_ppem) const
{ {
/* TODO: Make it possible to select strike. */ /* TODO: Make it possible to select strike. */
unsigned int count = sizeTables.len; unsigned int count = sizeTables.len;
for (uint32_t i = 0; i < count; ++i) for (uint32_t i = 0; i < count; ++i)
{
*x_ppem = sizeTables[i].ppemX;
*y_ppem = sizeTables[i].ppemY;
return sizeTables[i]; return sizeTables[i];
}
*x_ppem = *y_ppem = 0;
return Null(BitmapSizeTable); return Null(BitmapSizeTable);
} }
@ -403,11 +397,10 @@ struct CBDT
if (!cblc) if (!cblc)
return false; return false;
unsigned int x_ppem, y_ppem;
const void *base; const void *base;
const BitmapSizeTable &strike = this->cblc->choose_strike (font, &x_ppem, &y_ppem); const BitmapSizeTable &strike = this->cblc->choose_strike (font);
const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base);
if (!subtable_record || !x_ppem || !y_ppem) if (!subtable_record || !strike.ppemX || !strike.ppemY)
return false; return false;
if (subtable_record->get_extents (extents, base)) if (subtable_record->get_extents (extents, base))
@ -439,8 +432,8 @@ struct CBDT
} }
/* Convert to font units. */ /* Convert to font units. */
double x_scale = upem / (double) x_ppem; double x_scale = upem / (double) strike.ppemX;
double y_scale = upem / (double) y_ppem; double y_scale = upem / (double) strike.ppemY;
extents->x_bearing = round (extents->x_bearing * x_scale); extents->x_bearing = round (extents->x_bearing * x_scale);
extents->y_bearing = round (extents->y_bearing * y_scale); extents->y_bearing = round (extents->y_bearing * y_scale);
extents->width = round (extents->width * x_scale); extents->width = round (extents->width * x_scale);
@ -455,11 +448,10 @@ struct CBDT
if (!cblc) if (!cblc)
return hb_blob_get_empty (); return hb_blob_get_empty ();
unsigned int x_ppem, y_ppem;
const void *base; const void *base;
const BitmapSizeTable &strike = this->cblc->choose_strike (font, &x_ppem, &y_ppem); const BitmapSizeTable &strike = this->cblc->choose_strike (font);
const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base);
if (!subtable_record || !x_ppem || !y_ppem) if (!subtable_record || !strike.ppemX || !strike.ppemY)
return hb_blob_get_empty (); return hb_blob_get_empty ();
unsigned int image_offset = 0, image_length = 0, image_format = 0; unsigned int image_offset = 0, image_length = 0, image_format = 0;