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

[sbix] Select best strike based on ppem

This commit is contained in:
Behdad Esfahbod 2018-10-28 14:51:18 -07:00
parent f9f26bff4c
commit 01c7d53fb7
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,37 +172,44 @@ struct sbix
return result; return result;
} }
inline bool get_extents (hb_codepoint_t glyph, inline bool get_extents (hb_font_t *font,
unsigned int x_ppem, hb_codepoint_t glyph,
unsigned int y_ppem,
hb_glyph_extents_t *extents) const hb_glyph_extents_t *extents) const
{ {
/* We only support PNG right now, and following function checks type. */ /* We only support PNG right now, and following function checks type. */
return get_png_extents (glyph, x_ppem, y_ppem, extents); return get_png_extents (font, glyph, extents);
} }
inline hb_blob_t *reference_blob_for_glyph (hb_codepoint_t glyph_id, inline hb_blob_t *reference_blob_for_glyph (hb_font_t *font,
unsigned int x_ppem, hb_codepoint_t glyph_id,
unsigned int y_ppem,
unsigned int file_type, unsigned int file_type,
int *x_offset, int *x_offset,
int *y_offset) const int *y_offset) const
{ {
if (unlikely (sbix_len == 0 || sbix_table->strikes.len == 0)) if (unlikely (!sbix_len || !sbix_table->strikes.len))
return hb_blob_get_empty (); return hb_blob_get_empty ();
/* TODO: Does spec guarantee strikes are ascended sorted? */ unsigned int requested_ppem = MAX (font->x_ppem, font->y_ppem);
unsigned int group = sbix_table->strikes.len - 1; if (!requested_ppem)
unsigned int ppem = MAX (x_ppem, y_ppem); requested_ppem = 1<<30; /* Choose largest strike. */
if (ppem != 0) /* TODO Add DPI sensitivity as well? */
/* TODO: Use bsearch maybe or doesn't worth it? */ unsigned int best_i = 0;
for (group = 0; group < sbix_table->strikes.len; group++) unsigned int best_ppem = (sbix_table+sbix_table->strikes[0]).get_ppem ();
if ((sbix_table+sbix_table->strikes[group]).get_ppem () >= ppem)
break;
const SBIXStrike &strike = sbix_table+sbix_table->strikes[group]; for (unsigned int i = 1; i < sbix_table->strikes.len; i++)
{
unsigned int ppem = (sbix_table+sbix_table->strikes[i]).get_ppem ();
if ((requested_ppem <= ppem && ppem < best_ppem) ||
(requested_ppem > best_ppem && ppem > best_ppem))
{
best_i = i;
best_ppem = ppem;
}
}
const SBIXStrike &strike = sbix_table+sbix_table->strikes[best_i];
return strike.get_glyph_blob (glyph_id, sbix_blob, sbix_len, return strike.get_glyph_blob (glyph_id, sbix_blob, sbix_len,
sbix_table->strikes[group], sbix_table->strikes[best_i],
x_offset, y_offset, x_offset, y_offset,
file_type, num_glyphs); file_type, num_glyphs);
} }
@ -232,16 +239,15 @@ struct sbix
DEFINE_SIZE_STATIC (29); DEFINE_SIZE_STATIC (29);
}; };
inline bool get_png_extents (hb_codepoint_t glyph, inline bool get_png_extents (hb_font_t *font,
unsigned int x_ppem, hb_codepoint_t glyph,
unsigned int y_ppem,
hb_glyph_extents_t *extents) const hb_glyph_extents_t *extents) const
{ {
if (likely (sbix_len == 0)) if (likely (sbix_len == 0))
return false; return false;
int x_offset, y_offset; int x_offset, y_offset;
hb_blob_t *blob = reference_blob_for_glyph (glyph, x_ppem, y_ppem, hb_blob_t *blob = reference_blob_for_glyph (font, glyph,
HB_TAG ('p','n','g',' '), HB_TAG ('p','n','g',' '),
&x_offset, &y_offset); &x_offset, &y_offset);

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

@ -318,8 +318,7 @@ hb_ot_color_glyph_reference_png (hb_font_t *font, hb_codepoint_t glyph)
hb_blob_t *blob = hb_blob_get_empty (); hb_blob_t *blob = hb_blob_get_empty ();
if (_get_sbix (font->face).has_data ()) if (_get_sbix (font->face).has_data ())
blob = _get_sbix (font->face).reference_blob_for_glyph (glyph, blob = _get_sbix (font->face).reference_blob_for_glyph (font, glyph,
font->x_ppem, font->y_ppem,
HB_TAG('p','n','g',' '), HB_TAG('p','n','g',' '),
nullptr, nullptr); nullptr, nullptr);

2
src/hb-ot-font.cc
View File

@ -183,7 +183,7 @@ hb_ot_get_glyph_extents (hb_font_t *font,
void *user_data HB_UNUSED) void *user_data HB_UNUSED)
{ {
const hb_ot_face_data_t *ot_face = (const hb_ot_face_data_t *) font_data; const hb_ot_face_data_t *ot_face = (const hb_ot_face_data_t *) font_data;
bool ret = ot_face->sbix->get_extents (glyph, font->x_ppem, font->y_ppem, extents); bool ret = ot_face->sbix->get_extents (font, glyph, extents);
if (!ret) if (!ret)
ret = ot_face->glyf->get_extents (glyph, extents); ret = ot_face->glyf->get_extents (glyph, extents);
if (!ret) if (!ret)