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

[subset] Fix up ClassDef some more

This commit is contained in:
Behdad Esfahbod 2018-12-13 18:37:37 -05:00
parent 7ee6128902
commit c9c746c7f6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1244,17 +1244,22 @@ struct ClassDefFormat1
const hb_set_t &glyphset = *c->plan->glyphset; const hb_set_t &glyphset = *c->plan->glyphset;
const hb_map_t &glyph_map = *c->plan->glyph_map; const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> glyphs; hb_vector_t<GlyphID> glyphs;
hb_vector_t<HBUINT16> klasses;
hb_codepoint_t start = startGlyph; hb_codepoint_t start = startGlyph;
hb_codepoint_t end = start + classValue.len; hb_codepoint_t end = start + classValue.len;
for (hb_codepoint_t g = start; g < end; g++) for (hb_codepoint_t g = start; g < end; g++)
{ {
unsigned int value = classValue[g - start];
if (!value) continue;
if (!glyphset.has (g)) continue; if (!glyphset.has (g)) continue;
glyphs.push()->set (glyph_map[g]); glyphs.push()->set (glyph_map[g]);
klasses.push()->set (value);
} }
c->serializer->err (glyphs.in_error ()); c->serializer->err (glyphs.in_error () || klasses.in_error ());
Supplier<GlyphID> glyphs_supplier (glyphs); Supplier<GlyphID> glyphs_supplier (glyphs);
Supplier<HBUINT16> klasses_supplier (classValue.as_array ()); Supplier<HBUINT16> klasses_supplier (klasses);
ClassDef_serialize (c->serializer, ClassDef_serialize (c->serializer,
glyphs_supplier, glyphs_supplier,
klasses_supplier, klasses_supplier,
@ -1391,7 +1396,7 @@ struct ClassDefFormat2
const hb_set_t &glyphset = *c->plan->glyphset; const hb_set_t &glyphset = *c->plan->glyphset;
const hb_map_t &glyph_map = *c->plan->glyph_map; const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> glyphs; hb_vector_t<GlyphID> glyphs;
hb_vector_t<GlyphID> klasses; hb_vector_t<HBUINT16> klasses;
unsigned int count = rangeRecord.len; unsigned int count = rangeRecord.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
@ -1410,7 +1415,7 @@ struct ClassDefFormat2
c->serializer->err (glyphs.in_error () || klasses.in_error ()); c->serializer->err (glyphs.in_error () || klasses.in_error ());
Supplier<GlyphID> glyphs_supplier (glyphs); Supplier<GlyphID> glyphs_supplier (glyphs);
Supplier<GlyphID> klasses_supplier (klasses); Supplier<HBUINT16> klasses_supplier (klasses);
ClassDef_serialize (c->serializer, ClassDef_serialize (c->serializer,
glyphs_supplier, glyphs_supplier,
klasses_supplier, klasses_supplier,