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

[serialize] Adjust ClassDef 

[skip ci]
This commit is contained in:
Behdad Esfahbod 2018-12-20 12:26:30 -05:00
parent 4220b7bdd7
commit 6124123393
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/hb-ot-layout-common.hh
View File

@ -1206,12 +1206,8 @@ struct ClassDefFormat1
return_trace (true); return_trace (true);
} }
hb_codepoint_t glyph_min = (hb_codepoint_t) -1, glyph_max = 0; hb_codepoint_t glyph_min = glyphs[0];
for (unsigned int i = 0; i < glyphs.len; i++) hb_codepoint_t glyph_max = glyphs[glyphs.len - 1];
{
glyph_min = MIN<hb_codepoint_t> (glyph_min, glyphs[i]);
glyph_max = MAX<hb_codepoint_t> (glyph_max, glyphs[i]);
}
startGlyph.set (glyph_min); startGlyph.set (glyph_min);
classValue.len.set (glyph_max - glyph_min + 1); classValue.len.set (glyph_max - glyph_min + 1);
@ -1488,18 +1484,22 @@ struct ClassDef
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!c->extend_min (*this))) return_trace (false); if (unlikely (!c->extend_min (*this))) return_trace (false);
hb_codepoint_t glyph_min = (hb_codepoint_t) -1, glyph_max = 0; unsigned int format = 2;
for (unsigned int i = 0; i < glyphs.len; i++) if (glyphs.len)
{ {
glyph_min = MIN<hb_codepoint_t> (glyph_min, glyphs[i]); hb_codepoint_t glyph_min = glyphs[0];
glyph_max = MAX<hb_codepoint_t> (glyph_max, glyphs[i]); hb_codepoint_t glyph_max = glyphs[glyphs.len - 1];
unsigned int num_ranges = 1;
for (unsigned int i = 1; i < glyphs.len; i++)
if (glyphs[i - 1] + 1 != glyphs[i] ||
klasses[i - 1] != klasses[i])
num_ranges++;
if (1 + (glyph_max - glyph_min + 1) < num_ranges * 3)
format = 1;
} }
unsigned int num_ranges = 1; u.format.set (format);
for (unsigned int i = 1; i < glyphs.len; i++)
if (glyphs[i - 1] + 1 != glyphs[i] ||
klasses[i - 1] != klasses[i])
num_ranges++;
u.format.set (1 + (glyph_max - glyph_min + 1) < num_ranges * 3 ? 1 : 2);
switch (u.format) switch (u.format)
{ {