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

more build fixes

This commit is contained in:
Michiharu Ariza 2019-03-01 18:24:56 -08:00
parent ae0a557c2e
commit cf2ef92c74
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,7 @@ struct glyf
coord_setter.set (_points[i], v); coord_setter.set (_points[i], v);
} }
return true; return true;
}; }
/* for a simple glyph, return contour end points, flags, along with coordinate points /* for a simple glyph, return contour end points, flags, along with coordinate points
* for a composite glyph, return pseudo component points * for a composite glyph, return pseudo component points

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

@ -177,7 +177,7 @@ struct GlyphVarData
return (index < var_data->tupleVarCount.get_count ()) && return (index < var_data->tupleVarCount.get_count ()) &&
in_range (current_tuple) && in_range (current_tuple) &&
current_tuple->get_size (axis_count); current_tuple->get_size (axis_count);
}; }
bool move_to_next () bool move_to_next ()
{ {
@ -345,7 +345,6 @@ struct gvar
const HBUINT16 *get_short_offset_array () const { return (const HBUINT16 *)&offsetZ; } 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::contour_point_t contour_point_t;
typedef glyf::accelerator_t::phantom_point_index_t pp_t;
typedef glyf::accelerator_t::range_checker_t range_checker_t; typedef glyf::accelerator_t::range_checker_t range_checker_t;
public: public:
@ -439,8 +438,8 @@ struct gvar
if (!glyf_accel.get_contour_points (glyph, true, points, end_points)) return false; if (!glyf_accel.get_contour_points (glyph, true, 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;
for (unsigned int i = 0; i < pp_t::PHANTOM_COUNT; i++) for (unsigned int i = 0; i < glyf::accelerator_t::PHANTOM_COUNT; i++)
phantoms[i] = points[points.length - pp_t::PHANTOM_COUNT + i]; phantoms[i] = points[points.length - glyf::accelerator_t::PHANTOM_COUNT + i];
glyf::CompositeGlyphHeader::Iterator composite; glyf::CompositeGlyphHeader::Iterator composite;
if (!glyf_accel.get_composite (glyph, &composite)) return true; /* simple glyph */ if (!glyf_accel.get_composite (glyph, &composite)) return true; /* simple glyph */
@ -462,15 +461,15 @@ struct gvar
if (coord_count != gvar_table->axisCount) return advance; if (coord_count != gvar_table->axisCount) return advance;
hb_vector_t<contour_point_t> points; hb_vector_t<contour_point_t> points;
points.resize (pp_t::PHANTOM_COUNT); points.resize (glyf::accelerator_t::PHANTOM_COUNT);
if (!get_var_metrics (glyph, coords, coord_count, points)) if (!get_var_metrics (glyph, coords, coord_count, points))
return advance; return advance;
if (vertical) if (vertical)
return -(points[pp_t::PHANTOM_BOTTOM].y - points[pp_t::PHANTOM_TOP].y); // is this sign correct? return -(points[glyf::accelerator_t::PHANTOM_BOTTOM].y - points[glyf::accelerator_t::PHANTOM_TOP].y); // is this sign correct?
else else
return points[pp_t::PHANTOM_RIGHT].x - points[pp_t::PHANTOM_LEFT].x; return points[glyf::accelerator_t::PHANTOM_RIGHT].x - points[glyf::accelerator_t::PHANTOM_LEFT].x;
} }
protected: protected: