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

[subset] Fix hdmx subsetted size calculation.

This commit is contained in:
Garret Rieger 2018-09-05 18:04:52 -07:00 committed by Behdad Esfahbod
parent 1e6599f596
commit 21bf147054
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-hdmx-table.hh
View File

@ -88,8 +88,13 @@ struct DeviceRecord
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
if (unlikely (!c->allocate_size<DeviceRecord> (get_size (subset_view.len())))) unsigned int size = get_size (subset_view.len());
if (unlikely (!c->allocate_size<DeviceRecord> (size)))
{
DEBUG_MSG (SUBSET, nullptr, "Couldn't allocate enough space for DeviceRecord: %d.",
size);
return_trace (false); return_trace (false);
}
this->pixel_size.set (subset_view.source_device_record->pixel_size); this->pixel_size.set (subset_view.source_device_record->pixel_size);
this->max_width.set (subset_view.source_device_record->max_width); this->max_width.set (subset_view.source_device_record->max_width);
@ -160,14 +165,14 @@ struct hdmx
return_trace (true); return_trace (true);
} }
static inline size_t get_subsetted_size (hb_subset_plan_t *plan) static inline size_t get_subsetted_size (const hdmx *source_hdmx, hb_subset_plan_t *plan)
{ {
return min_size + DeviceRecord::get_size (plan->glyphs.len); return min_size + source_hdmx->num_records * DeviceRecord::get_size (plan->glyphs.len);
} }
inline bool subset (hb_subset_plan_t *plan) const inline bool subset (hb_subset_plan_t *plan) const
{ {
size_t dest_size = get_subsetted_size (plan); size_t dest_size = get_subsetted_size (this, plan);
hdmx *dest = (hdmx *) malloc (dest_size); hdmx *dest = (hdmx *) malloc (dest_size);
if (unlikely (!dest)) if (unlikely (!dest))
{ {
@ -180,6 +185,7 @@ struct hdmx
if (!hdmx_prime || !hdmx_prime->serialize (&c, this, plan)) if (!hdmx_prime || !hdmx_prime->serialize (&c, this, plan))
{ {
free (dest); free (dest);
DEBUG_MSG(SUBSET, nullptr, "Failed to serialize write new hdmx.");
return false; return false;
} }
c.end_serialize (); c.end_serialize ();

BIN
test/api/fonts/Roboto-Regular.multihdmx.a.ttf Normal file
View File

Binary file not shown.

BIN
test/api/fonts/Roboto-Regular.multihdmx.abc.ttf Normal file
View File

Binary file not shown.

20
test/api/test-subset-hdmx.c
View File

@ -50,6 +50,25 @@ test_subset_hdmx_simple_subset (void)
hb_face_destroy (face_ac); hb_face_destroy (face_ac);
} }
static void
test_subset_hdmx_multiple_device_records (void)
{
hb_face_t *face_abc = hb_subset_test_open_font ("fonts/Roboto-Regular.multihdmx.abc.ttf");
hb_face_t *face_a = hb_subset_test_open_font ("fonts/Roboto-Regular.multihdmx.a.ttf");
hb_set_t *codepoints = hb_set_create ();
hb_face_t *face_abc_subset;
hb_set_add (codepoints, 'a');
face_abc_subset = hb_subset_test_create_subset (face_abc, hb_subset_test_create_input (codepoints));
hb_set_destroy (codepoints);
hb_subset_test_check (face_a, face_abc_subset, HB_TAG ('h','d','m','x'));
hb_face_destroy (face_abc_subset);
hb_face_destroy (face_abc);
hb_face_destroy (face_a);
}
static void static void
test_subset_hdmx_invalid (void) test_subset_hdmx_invalid (void)
{ {
@ -115,6 +134,7 @@ main (int argc, char **argv)
hb_test_init (&argc, &argv); hb_test_init (&argc, &argv);
hb_test_add (test_subset_hdmx_simple_subset); hb_test_add (test_subset_hdmx_simple_subset);
hb_test_add (test_subset_hdmx_multiple_device_records);
hb_test_add (test_subset_hdmx_invalid); hb_test_add (test_subset_hdmx_invalid);
hb_test_add (test_subset_hdmx_fails_sanitize); hb_test_add (test_subset_hdmx_fails_sanitize);
hb_test_add (test_subset_hdmx_noop); hb_test_add (test_subset_hdmx_noop);