From 434ea06841e60b98601b529ca20cf6bf25f6c165 Mon Sep 17 00:00:00 2001 From: Michiharu Ariza Date: Sat, 16 Mar 2019 00:08:03 -0700 Subject: [PATCH] fix tt var extents & add test --- src/hb-ot-glyf-table.hh | 32 +-- src/hb-ot-var-gvar-table.hh | 270 ++++++++++-------- test/api/Makefile.am | 1 + .../fonts/SourceSansVariable-Roman.abc.ttf | Bin 0 -> 3240 bytes test/api/test-ot-metrics-tt-var.c | 72 +++++ 5 files changed, 236 insertions(+), 139 deletions(-) create mode 100644 test/api/fonts/SourceSansVariable-Roman.abc.ttf create mode 100644 test/api/test-ot-metrics-tt-var.c diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh index 538577a1d..a494bbebb 100644 --- a/src/hb-ot-glyf-table.hh +++ b/src/hb-ot-glyf-table.hh @@ -299,8 +299,8 @@ struct glyf struct range_checker_t { - range_checker_t (const void *_table, unsigned int _start_offset, unsigned int _end_offset) - : table ((const char*)_table), start_offset (_start_offset), end_offset (_end_offset) {} + range_checker_t (const void *table_, unsigned int start_offset_, unsigned int end_offset_) + : table ((const char*)table_), start_offset (start_offset_), end_offset (end_offset_) {} template bool in_range (const T *p) const @@ -331,14 +331,14 @@ struct glyf template static bool read_points (const HBUINT8 *&p /* IN/OUT */, - hb_vector_t &_points /* IN/OUT */, + hb_vector_t &points_ /* IN/OUT */, const range_checker_t &checker) { T coord_setter; float v = 0; - for (unsigned int i = 0; i < _points.length - PHANTOM_COUNT; i++) + for (unsigned int i = 0; i < points_.length - PHANTOM_COUNT; i++) { - uint8_t flag = _points[i].flag; + uint8_t flag = points_[i].flag; if (coord_setter.is_short (flag)) { if (unlikely (!checker.in_range (p))) return false; @@ -352,11 +352,11 @@ struct glyf if (unlikely (!checker.in_range ((const HBUINT16 *)p))) return false; if (!coord_setter.is_same (flag)) { - v = *(const HBINT16 *)p; + v += *(const HBINT16 *)p; p += HBINT16::static_size; } } - coord_setter.set (_points[i], v); + coord_setter.set (points_[i], v); } return true; } @@ -366,7 +366,7 @@ struct glyf * in both cases points trailed with four phantom points */ bool get_contour_points (hb_codepoint_t glyph, - hb_vector_t &_points /* OUT */, + hb_vector_t &points_ /* OUT */, hb_vector_t &_end_points /* OUT */, const bool phantom_only=false) const { @@ -382,8 +382,8 @@ struct glyf { /* For a composite glyph, add one pseudo point for each component */ do { num_points++; } while (composite.move_to_next()); - _points.resize (num_points + PHANTOM_COUNT); - for (unsigned int i = 0; i < _points.length; i++) _points[i].init (); + points_.resize (num_points + PHANTOM_COUNT); + for (unsigned int i = 0; i < points_.length; i++) points_[i].init (); return true; } @@ -408,8 +408,8 @@ struct glyf } while (composite.move_to_next()); } - _points.resize (num_points + PHANTOM_COUNT); - for (unsigned int i = 0; i < _points.length; i++) _points[i].init (); + points_.resize (num_points + PHANTOM_COUNT); + for (unsigned int i = 0; i < points_.length; i++) points_[i].init (); if ((num_contours <= 0) || phantom_only) return true; /* Read simple glyph points if !phantom_only */ @@ -426,19 +426,19 @@ struct glyf { if (unlikely (!checker.in_range (p))) return false; uint8_t flag = *p++; - _points[i].flag = flag; + points_[i].flag = flag; if ((flag & FLAG_REPEAT) != 0) { if (unlikely (!checker.in_range (p))) return false; unsigned int repeat_count = *p++; while ((repeat_count-- > 0) && (++i < num_points)) - _points[i].flag = flag; + points_[i].flag = flag; } } /* Read x & y coordinates */ - return (read_points (p, _points, checker) && - read_points (p, _points, checker)); + return (read_points (p, points_, checker) && + read_points (p, points_, checker)); } /* based on FontTools _g_l_y_f.py::trim */ diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh index 5c157a1d5..5b5a7884b 100644 --- a/src/hb-ot-var-gvar-table.hh +++ b/src/hb-ot-var-gvar-table.hh @@ -159,21 +159,36 @@ struct TupleVarCount : HBUINT16 struct GlyphVarData { + typedef glyf::accelerator_t::range_checker_t range_checker_t; + const TupleVarHeader &get_tuple_var_header (void) const { return StructAfter(data); } struct tuple_iterator_t { - void init (const GlyphVarData *_var_data, unsigned int _length, unsigned int _axis_count) + void init (const GlyphVarData *var_data_, unsigned int length_, unsigned int axis_count_) { - var_data = _var_data; - length = _length; + var_data = var_data_; + length = length_; index = 0; - axis_count = _axis_count; + axis_count = axis_count_; current_tuple = &var_data->get_tuple_var_header (); data_offset = 0; } + bool get_shared_indices (hb_vector_t &shared_indices /* OUT */) + { + if (var_data->has_shared_point_numbers ()) + { + range_checker_t checker (var_data, 0, length); + const HBUINT8 *base = &(var_data+var_data->data); + const HBUINT8 *p = base; + if (!unpack_points (p, shared_indices, checker)) return false; + data_offset = p - base; + } + return true; + } + bool is_valid () const { return (index < var_data->tupleVarCount.get_count ()) && @@ -211,14 +226,114 @@ struct GlyphVarData static bool get_tuple_iterator (const GlyphVarData *var_data, unsigned int length, unsigned int axis_count, + hb_vector_t &shared_indices /* OUT */, tuple_iterator_t *iterator /* OUT */) { iterator->init (var_data, length, axis_count); + if (!iterator->get_shared_indices (shared_indices)) + return false; return iterator->is_valid (); } bool has_shared_point_numbers () const { return tupleVarCount.has_shared_point_numbers (); } + static bool unpack_points (const HBUINT8 *&p /* IN/OUT */, + hb_vector_t &points /* OUT */, + const range_checker_t &check) + { + enum packed_point_flag_t + { + POINTS_ARE_WORDS = 0x80, + POINT_RUN_COUNT_MASK = 0x7F + }; + + if (!check.in_range (p)) return false; + uint16_t count = *p++; + if ((count & POINTS_ARE_WORDS) != 0) + { + if (!check.in_range (p)) return false; + count = ((count & POINT_RUN_COUNT_MASK) << 8) | *p++; + } + points.resize (count); + + uint16_t i = 0; + while (i < count) + { + if (!check.in_range (p)) return false; + uint16_t j; + uint8_t control = *p++; + uint16_t run_count = (control & POINT_RUN_COUNT_MASK) + 1; + if ((control & POINTS_ARE_WORDS) != 0) + { + for (j = 0; j < run_count && i < count; j++, i++) + { + if (!check.in_range ((const HBUINT16 *)p)) return false; + points[i] = *(const HBUINT16 *)p; + p += HBUINT16::static_size; + } + } + else + { + for (j = 0; j < run_count && i < count; j++, i++) + { + if (!check.in_range (p)) return false; + points[i] = *p++; + } + } + if (j < run_count) return false; + } + return true; + } + + static bool unpack_deltas (const HBUINT8 *&p /* IN/OUT */, + hb_vector_t &deltas /* IN/OUT */, + const range_checker_t &check) + { + enum packed_delta_flag_t + { + DELTAS_ARE_ZERO = 0x80, + DELTAS_ARE_WORDS = 0x40, + DELTA_RUN_COUNT_MASK = 0x3F + }; + + unsigned int i = 0; + unsigned int count = deltas.length; + while (i < count) + { + if (!check.in_range (p)) return false; + uint16_t j; + uint8_t control = *p++; + uint16_t run_count = (control & DELTA_RUN_COUNT_MASK) + 1; + if ((control & DELTAS_ARE_ZERO) != 0) + { + for (j = 0; j < run_count && i < count; j++, i++) + deltas[i] = 0; + } + else if ((control & DELTAS_ARE_WORDS) != 0) + { + for (j = 0; j < run_count && i < count; j++, i++) + { + if (!check.in_range ((const HBUINT16 *)p)) + return false; + deltas[i] = *(const HBINT16 *)p; + p += HBUINT16::static_size; + } + } + else + { + for (j = 0; j < run_count && i < count; j++, i++) + { + if (!check.in_range (p)) + return false; + deltas[i] = *(const HBINT8 *)p++; + } + } + if (j < run_count) + return false; + } + return true; + } + protected: TupleVarCount tupleVarCount; OffsetTo data; @@ -347,7 +462,6 @@ struct gvar const HBUINT16 *get_short_offset_array () const { return (const HBUINT16 *)&offsetZ; } typedef glyf::accelerator_t::contour_point_t contour_point_t; - typedef glyf::accelerator_t::range_checker_t range_checker_t; public: struct accelerator_t @@ -404,10 +518,12 @@ struct gvar if (unlikely (coord_count != gvar_table->axisCount)) return false; const GlyphVarData *var_data = gvar_table->get_glyph_var_data (glyph); + hb_vector_t shared_indices; GlyphVarData::tuple_iterator_t iterator; if (!GlyphVarData::get_tuple_iterator (var_data, gvar_table->get_glyph_var_data_length (glyph), gvar_table->axisCount, + shared_indices, &iterator)) return false; @@ -421,25 +537,26 @@ struct gvar if (scalar == 0.f) continue; const HBUINT8 *p = iterator.get_serialized_data (); unsigned int length = iterator.current_tuple->get_data_size (); - if (unlikely (!iterator.in_range (p, length))) return false; + if (unlikely (!iterator.in_range (p, length))) + return false; - range_checker_t checker (p, 0, length); - hb_vector_t shared_indices; - if (var_data->has_shared_point_numbers () && - !unpack_points (p, shared_indices, checker)) return false; + GlyphVarData::range_checker_t checker (p, 0, length); hb_vector_t private_indices; if (iterator.current_tuple->has_private_points () && - !unpack_points (p, private_indices, checker)) return false; + !GlyphVarData::unpack_points (p, private_indices, checker)) + return false; const hb_array_t &indices = shared_indices.length? shared_indices: private_indices; bool apply_to_all = (indices.length == 0); unsigned int num_deltas = apply_to_all? points.length: indices.length; hb_vector_t x_deltas; x_deltas.resize (num_deltas); - if (!unpack_deltas (p, x_deltas, checker)) return false; + if (!GlyphVarData::unpack_deltas (p, x_deltas, checker)) + return false; hb_vector_t y_deltas; y_deltas.resize (num_deltas); - if (!unpack_deltas (p, y_deltas, checker)) return false; + if (!GlyphVarData::unpack_deltas (p, y_deltas, checker)) + return false; for (unsigned int i = 0; i < num_deltas; i++) { @@ -448,7 +565,6 @@ struct gvar deltas[pt_index].x += x_deltas[i] * scalar; deltas[pt_index].y += y_deltas[i] * scalar; } - /* TODO: interpolate untouched points for glyph extents */ } while (iterator.move_to_next ()); /* infer deltas for unreferenced points */ @@ -460,22 +576,22 @@ struct gvar { if (deltas[i].flag) continue; /* search in both directions within the contour for a pair of referenced points */ - unsigned int pre; - for (pre = i;;) + unsigned int prev; + for (prev = i;;) { - if (pre-- <= start_point) pre = end_point; - if (pre == i || deltas[pre].flag) break; + if (prev-- <= start_point) prev = end_point; + if (prev == i || deltas[prev].flag) break; } - if (pre == i) continue; /* no (preceeding) referenced point was found */ - unsigned int fol; - for (fol = i;;) + if (prev == i) continue; /* no (previous) referenced point was found */ + unsigned int next; + for (next = i;;) { - if (fol++ >= end_point) fol = start_point; - if (fol == i || deltas[fol].flag) break; + if (next++ >= end_point) next = start_point; + if (next == i || deltas[next].flag) break; } - assert (fol != i); - deltas[i].x = infer_delta (points[i].x, points[pre].x, points[fol].x, deltas[pre].x, deltas[fol].x); - deltas[i].y = infer_delta (points[i].y, points[pre].y, points[fol].y, deltas[pre].y, deltas[fol].y); + assert (next != i); + deltas[i].x = infer_delta (points[i].x, points[prev].x, points[next].x, deltas[prev].x, deltas[next].x); + deltas[i].y = infer_delta (points[i].y, points[prev].y, points[next].y, deltas[prev].y, deltas[next].y); } start_point = end_point + 1; } @@ -498,7 +614,8 @@ struct gvar hb_vector_t points; hb_vector_t end_points; if (!glyf_accel.get_contour_points (glyph, points, end_points, true/*phantom_only*/)) return false; - if (!apply_deltas_to_points (glyph, coords, coord_count, points.as_array (), end_points.as_array ())) return false; + if (!apply_deltas_to_points (glyph, coords, coord_count, points.as_array (), end_points.as_array ())) + return false; for (unsigned int i = 0; i < glyf_acc_t::PHANTOM_COUNT; i++) phantoms[i] = points[points.length - glyf_acc_t::PHANTOM_COUNT + i]; @@ -542,14 +659,15 @@ struct gvar hb_vector_t points; hb_vector_t end_points; if (!glyf_accel.get_contour_points (glyph, points, end_points)) return false; - if (!apply_deltas_to_points (glyph, coords, coord_count, points.as_array (), end_points.as_array ())) return false; + if (!apply_deltas_to_points (glyph, coords, coord_count, points.as_array (), end_points.as_array ())) + return false; glyf::CompositeGlyphHeader::Iterator composite; if (!glyf_accel.get_composite (glyph, &composite)) { /* simple glyph */ for (unsigned int i = 0; i + glyf_acc_t::PHANTOM_COUNT < points.length; i++) - bounds.add (points[i]); + bounds.add (points[i]); /* TODO: need to check ON_CURVE or flatten? */ return true; } /* composite glyph */ @@ -622,100 +740,6 @@ struct gvar const GlyphVarData *get_glyph_var_data (hb_codepoint_t glyph) const { return gvar_table->get_glyph_var_data (glyph); } - static bool unpack_points (const HBUINT8 *&p /* IN/OUT */, - hb_vector_t &points /* OUT */, - const range_checker_t &check) - { - enum packed_point_flag_t - { - POINTS_ARE_WORDS = 0x80, - POINT_RUN_COUNT_MASK = 0x7F - }; - - if (!check.in_range (p)) return false; - uint16_t count = *p++; - if ((count & POINTS_ARE_WORDS) != 0) - { - if (!check.in_range (p)) return false; - count = ((count & POINT_RUN_COUNT_MASK) << 8) | *p++; - } - points.resize (count); - - uint16_t i = 0; - while (i < count) - { - if (!check.in_range (p)) return false; - uint16_t j; - uint8_t control = *p++; - uint16_t run_count = (control & POINT_RUN_COUNT_MASK) + 1; - if ((control & POINTS_ARE_WORDS) != 0) - { - for (j = 0; j < run_count && i < count; j++, i++) - { - if (!check.in_range ((const HBUINT16 *)p)) return false; - points[i] = *(const HBUINT16 *)p; - p += HBUINT16::static_size; - } - } - else - { - for (j = 0; j < run_count && i < count; j++, i++) - { - if (!check.in_range (p)) return false; - points[i] = *p++; - } - } - if (j < run_count) return false; - } - return true; - } - - static bool unpack_deltas (const HBUINT8 *&p /* IN/OUT */, - hb_vector_t &deltas /* IN/OUT */, - const range_checker_t &check) - { - enum packed_delta_flag_t - { - DELTAS_ARE_ZERO = 0x80, - DELTAS_ARE_WORDS = 0x40, - DELTA_RUN_COUNT_MASK = 0x3F - }; - - unsigned int i = 0; - unsigned int count = deltas.length; - while (i < count) - { - if (!check.in_range (p)) return false; - uint16_t j; - uint8_t control = *p++; - uint16_t run_count = (control & DELTA_RUN_COUNT_MASK) + 1; - if ((control & DELTAS_ARE_ZERO) != 0) - { - for (j = 0; j < run_count && i < count; j++, i++) - deltas[i] = 0; - } - else if ((control & DELTAS_ARE_WORDS) != 0) - { - for (j = 0; j < run_count && i < count; j++, i++) - { - if (!check.in_range ((const HBUINT16 *)p)) return false; - deltas[i] = *(const HBINT16 *)p; - p += HBUINT16::static_size; - } - } - else - { - for (j = 0; j < run_count && i < count; j++, i++) - { - if (!check.in_range (p)) return false; - deltas[i] = *(const HBINT8 *)p++; - } - } - if (j < run_count) return false; - } - return true; - } - private: hb_blob_ptr_t gvar_table; hb_vector_t shared_tuples; diff --git a/test/api/Makefile.am b/test/api/Makefile.am index 67d66e16d..0f3dab73a 100644 --- a/test/api/Makefile.am +++ b/test/api/Makefile.am @@ -82,6 +82,7 @@ TEST_PROGS += \ test-ot-name \ test-ot-tag \ test-ot-extents-cff \ + test-ot-metrics-tt-var \ $(NULL) diff --git a/test/api/fonts/SourceSansVariable-Roman.abc.ttf b/test/api/fonts/SourceSansVariable-Roman.abc.ttf new file mode 100644 index 0000000000000000000000000000000000000000..690d7d5392e21dc9ad01b86dfbe35ce8591c02ac GIT binary patch literal 3240 zcma)8drVu`8UN0`#yG}+F@Asn#{*-)jU8i*c{$WLgsdq6$Ix_*)Rr6bFby`I@tVh^ z38G4^DpiWMO3Po{G;L9qKPK%VZHk(RYExECQ?+GLmQ~vnr4s5;l%h02T~*=z&bgOI zvS`h{I_G@P-}gA@K8O)fH6|Se4-Os}ip2dkB10I`eFqbxWBTu`-2`7CV#b4GFT}rR zJ8LJ}wFrIW>qiHYueF^^f&VS%4}*W^UP}-7HSp2VvAv;VFD+aklHK4Z#>NN6%Z-0s zAu{d(|0m^jC4btLfp6J2zVm_ zGtiHmoBSvIVb5CAQ_7_6SF4waq+i26l7_(eX2}QOzXb0|X9}kb0Tu#(7rc3HKBdsd z^g8&9;EfsORF3MI1pY1X?yQoT`hoN6e&ll-4GQJv7YfC{5c~~Rt|y72#Ru$Nwn`1u zO5|wtdOO3Bu87y$)Tl3Q>6bb}cDt>rsijG;ZwW=ZIx8fb)qbt{S?~EDv#M~YBk3?# zh6h`^V@{_|YJMrOCmEdmc4WX**W*u&Sz3nMTP-zZ4faqnxberBD^Txi{kf?v+Sauf zDbfUDuSnO)N=-y1joy}~(x$2oTWKUB!dgYlNM~5hrpj(-md3+PlFsRpyf69(Uhwrz zbcGWE_rbpAalbEN`dVF3x_)!Q9f)QR9a-qF?@RCBcf9ABwvAgJ7urh^#QTY;l}F>1 z@<5JKfv-nl_72qO(Ce9LpVA#wdP4CUYfZ1WBiZgxcC`)GT3pYY`f{U*Z}v4i?2g?% zQ}Os@cVmsct{L6r=TJxI$V6Ex6&wWGr6XBT{n)FYg5tKUWcM#V`~J(XRz@F^EPulF zfBXDMwYD~FL^p05ax&jnJ$fZBDMu4*g`$!Z>s5+y9QoG9r`XT)u#XyYkHzH~$!v{2 zpb|9vZHb@K=hcNM*7t>tspNLC5pjx&{X0qhJ(DN%x9+9*I@CiT#ipuzyMK zVsVSQxF@gAgTd)Ra2&~l)hKu!EV)i69$5&$tW8% z+D1OvLO(;tLKLKS3^)0=xNcAbG)ePxoTfmJ(P>(s0_Y4@H$8{bmx4A=IWa3jHwjHE zr9l@U@1?!CPl`K${oO@*;5HgUu z-8IN&p1uXE6ivBnDX^1=GU)ibOag`ldj57dYwHBKAkI8dH^NFP3bmLd^CoTtS#RSCtu`f!Yjg;7qR5NnNW33vPgHIbl`RSvF{`}@QTUNw zctkHeq8Fa6UI;I3;(q+yzVqU;|Lr~hra+Sj`J5_+*?=1A7Yg}#&~z$2QxKXb`}6)n zQ?BkO_vCT;Zg@yKIg>8n8$h!KWsVtOXNI&J{hq)R`4*iQ*7$eCHISPMbyO6cWnUyhoVR^Q!oK;}vIaV?=0`SbL7@h?lgHbc*pZy@3j9n;rC(`<6<=zKD)Hj>gHlRd9TnLF=+a1#FrHZw+&nTTf(*5C$f0ucO(@PA0^CAZSS848lb~u?B`skx{ zdivP@uJ&+mZ*Nbp<^J!1a`}$FW;mTb>>}UNS*F)7)vv5LLq6bEo68N1a=F6|#`Qm3 zxNzb9n?o<>mhht`aQ6duw^{!Xx&O!Fu50wJ-naPnDQC`{nTdJK5AV4g268SfIc0;X evKnZ+UDvK$ym;| + +/* Unit tests for glyph advance widths and extents of TrueType variable fonts */ + +static void +test_extents_tt_var (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.abc.ttf"); + g_assert (face); + hb_font_t *font = hb_font_create (face); + hb_face_destroy (face); + g_assert (font); + hb_ot_font_set_funcs (font); + + hb_glyph_extents_t extents; + hb_bool_t result = hb_font_get_glyph_extents (font, 1, &extents); + g_assert (result); + + g_assert_cmpint (extents.x_bearing, ==, 60); + g_assert_cmpint (extents.y_bearing, ==, 490); + g_assert_cmpint (extents.width, ==, 344); + g_assert_cmpint (extents.height, ==, -502); + + float coords[1] = { 500.0f }; + hb_font_set_var_coords_design (font, coords, 1); + result = hb_font_get_glyph_extents (font, 1, &extents); + g_assert (result); + + g_assert_cmpint (extents.x_bearing, ==, 49); + g_assert_cmpint (extents.y_bearing, ==, 501); + g_assert_cmpint (extents.width, ==, 393); + g_assert_cmpint (extents.height, ==, -513); + + hb_font_destroy (font); +} + +int +main (int argc, char **argv) +{ + hb_test_init (&argc, &argv); + + hb_test_add (test_extents_tt_var); + + return hb_test_run (); +}