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

[subset] add a (failing for now) test for composite glyf hint dropping

This commit is contained in:
Rod Sheeter 2018-02-27 17:23:30 -08:00
parent 903771b6c7
commit b3790a65a1
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-ot-glyf-table.hh
View File

@ -402,14 +402,14 @@ struct glyf
int16_t num_contours = (int16_t) glyph_header.numberOfContours; int16_t num_contours = (int16_t) glyph_header.numberOfContours;
if (num_contours < 0) if (num_contours < 0)
{ {
CompositeGlyphHeader::Iterator *composite_it; CompositeGlyphHeader::Iterator composite_it;
if (unlikely (!CompositeGlyphHeader::get_iterator ( if (unlikely (!CompositeGlyphHeader::get_iterator (
(const char*) this->glyf_table + start_offset, (const char*) this->glyf_table + start_offset,
end_offset - start_offset, composite_it))) return false; end_offset - start_offset, &composite_it))) return false;
const CompositeGlyphHeader *last; const CompositeGlyphHeader *last;
do { do {
last = composite_it->current; last = composite_it.current;
} while (composite_it->move_to_next()); } while (composite_it.move_to_next());
if ( (uint16_t) last->flags & CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS) if ( (uint16_t) last->flags & CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS)
*instruction_start = start_offset + ((char *) last - (char *) glyf_table->dataX) + last->get_size(); *instruction_start = start_offset + ((char *) last - (char *) glyf_table->dataX) + last->get_size();

27
test/api/test-subset-glyf.c
View File

@ -105,7 +105,7 @@ test_subset_glyf_noop (void)
} }
static void static void
test_subset_glyf_strip_hints (void) test_subset_glyf_strip_hints_simple (void)
{ {
hb_face_t *face_abc = hb_subset_test_open_font ("fonts/Roboto-Regular.abc.ttf"); hb_face_t *face_abc = hb_subset_test_open_font ("fonts/Roboto-Regular.abc.ttf");
hb_face_t *face_ac = hb_subset_test_open_font ("fonts/Roboto-Regular.ac.nohints.ttf"); hb_face_t *face_ac = hb_subset_test_open_font ("fonts/Roboto-Regular.ac.nohints.ttf");
@ -128,6 +128,28 @@ test_subset_glyf_strip_hints (void)
} }
// TODO(rsheeter): test strip hints from composite // TODO(rsheeter): test strip hints from composite
static void
test_subset_glyf_strip_hints_composite (void)
{
hb_face_t *face_components = hb_subset_test_open_font ("fonts/Roboto-Regular.components.ttf");
hb_face_t *face_subset = hb_subset_test_open_font ("fonts/Roboto-Regular.components.subset.ttf");
hb_set_t *codepoints = hb_set_create();
hb_set_add (codepoints, 0x1fc);
hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
*hb_subset_input_drop_hints(input) = true;
hb_face_t *face_generated_subset = hb_subset_test_create_subset (face_components, input);
hb_set_destroy (codepoints);
hb_subset_test_check (face_subset, face_generated_subset, HB_TAG ('g','l','y','f'));
hb_subset_test_check (face_subset, face_generated_subset, HB_TAG ('l','o','c', 'a'));
check_maxp_num_glyphs(face_generated_subset, 4);
hb_face_destroy (face_generated_subset);
hb_face_destroy (face_subset);
hb_face_destroy (face_components);
}
// TODO(grieger): test for long loca generation. // TODO(grieger): test for long loca generation.
@ -138,7 +160,8 @@ main (int argc, char **argv)
hb_test_add (test_subset_glyf_noop); hb_test_add (test_subset_glyf_noop);
hb_test_add (test_subset_glyf); hb_test_add (test_subset_glyf);
hb_test_add (test_subset_glyf_strip_hints); hb_test_add (test_subset_glyf_strip_hints_simple);
hb_test_add (test_subset_glyf_strip_hints_composite);
hb_test_add (test_subset_glyf_with_components); hb_test_add (test_subset_glyf_with_components);
return hb_test_run(); return hb_test_run();