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

fix infer_delta 

code cleanup
This commit is contained in:
Michiharu Ariza 2019-03-17 17:48:10 -07:00
parent 4f4fbb1d5e
commit a35e3dfc77
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,9 +513,9 @@ struct glyf
return true; return true;
} }
struct bounds_t struct contour_bounds_t
{ {
bounds_t () { min.x = min.y = FLT_MAX; max.x = max.y = FLT_MIN; } contour_bounds_t () { min.x = min.y = FLT_MAX; max.x = max.y = FLT_MIN; }
void add (const contour_point_t &p) void add (const contour_point_t &p)
{ {
@ -525,8 +525,14 @@ struct glyf
max.y = MAX (max.y, p.y); max.y = MAX (max.y, p.y);
} }
void _union (const bounds_t &b) void merge (const contour_bounds_t &b)
{ add (b.min); add (b.max); } {
if (empty ()) { *this = b; return; }
add (b.min);
add (b.max);
}
bool empty () const { return (min.x >= max.x) || (min.y >= max.y); }
contour_point_t min; contour_point_t min;
contour_point_t max; contour_point_t max;
@ -535,7 +541,7 @@ struct glyf
/* Note: Recursively calls itself. Who's checking recursively nested composite glyph BTW? */ /* Note: Recursively calls itself. Who's checking recursively nested composite glyph BTW? */
bool get_bounds_var (hb_codepoint_t glyph, bool get_bounds_var (hb_codepoint_t glyph,
const int *coords, unsigned int coord_count, const int *coords, unsigned int coord_count,
bounds_t &bounds) const contour_bounds_t &bounds) const
{ {
hb_vector_t<contour_point_t> points; hb_vector_t<contour_point_t> points;
hb_vector_t<unsigned int> end_points; hb_vector_t<unsigned int> end_points;
@ -555,12 +561,12 @@ struct glyf
/* composite glyph */ /* composite glyph */
do do
{ {
bounds_t comp_bounds; contour_bounds_t comp_bounds;
if (unlikely (!get_bounds_var (composite.current->glyphIndex, coords, coord_count, comp_bounds))) return false; if (unlikely (!get_bounds_var (composite.current->glyphIndex, coords, coord_count, comp_bounds))) return false;
composite.current->transform_point (comp_bounds.min.x, comp_bounds.min.y); composite.current->transform_point (comp_bounds.min.x, comp_bounds.min.y);
composite.current->transform_point (comp_bounds.max.x, comp_bounds.max.y); composite.current->transform_point (comp_bounds.max.x, comp_bounds.max.y);
bounds._union (comp_bounds); bounds.merge (comp_bounds);
} while (composite.move_to_next()); } while (composite.move_to_next());
/* Shift bounds by the updated left side bearing (vertically too?) */ /* Shift bounds by the updated left side bearing (vertically too?) */
@ -577,7 +583,7 @@ struct glyf
const int *coords, unsigned int coord_count, const int *coords, unsigned int coord_count,
hb_glyph_extents_t *extents) const hb_glyph_extents_t *extents) const
{ {
bounds_t bounds; contour_bounds_t bounds;
if (unlikely (!get_bounds_var (glyph, coords, coord_count, bounds))) return false; if (unlikely (!get_bounds_var (glyph, coords, coord_count, bounds))) return false;
if (bounds.min.x >= bounds.max.x) if (bounds.min.x >= bounds.max.x)

9
src/hb-ot-var-gvar-table.hh
View File

@ -575,6 +575,11 @@ struct gvar
} while (iterator.move_to_next ()); } while (iterator.move_to_next ());
/* infer deltas for unreferenced points */ /* infer deltas for unreferenced points */
hb_vector_t<contour_point_t> orig_points;
orig_points.resize (points.length);
for (unsigned int i = 0; i < orig_points.length; i++)
orig_points[i] = points[i];
unsigned int start_point = 0; unsigned int start_point = 0;
for (unsigned int c = 0; c < end_points.length; c++) for (unsigned int c = 0; c < end_points.length; c++)
{ {
@ -597,8 +602,8 @@ struct gvar
if (next == i || deltas[next].flag) break; if (next == i || deltas[next].flag) break;
} }
assert (next != i); 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].x = infer_delta<x_getter> (orig_points.as_array (), deltas.as_array (), i, prev, next);
deltas[i].y = infer_delta (points[i].y, points[prev].y, points[next].y, deltas[prev].y, deltas[next].y); deltas[i].y = infer_delta<y_getter> (orig_points.as_array (), deltas.as_array (), i, prev, next);
} }
start_point = end_point + 1; start_point = end_point + 1;
} }