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

fix xshift by (lsb - xMin)

This commit is contained in:
Michiharu Ariza 2019-04-03 10:33:55 -07:00
parent 27d3bac8ef
commit c2d727a479
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,14 +445,14 @@ struct glyf
{
const GlyphHeader &header = get_header (glyph);
int h_delta = (int)header.xMin - hmtx_accel.get_side_bearing (glyph);
int v_delta = (int)header.yMax - vmtx_accel.get_side_bearing (glyph);
int v_orig = (int)header.yMax + vmtx_accel.get_side_bearing (glyph);
unsigned int h_adv = hmtx_accel.get_advance (glyph);
unsigned int v_adv = vmtx_accel.get_advance (glyph);
phantoms[PHANTOM_LEFT].x = h_delta;
phantoms[PHANTOM_RIGHT].x = h_adv + h_delta;
phantoms[PHANTOM_TOP].y = v_delta;
phantoms[PHANTOM_BOTTOM].y = -v_adv + v_delta;
phantoms[PHANTOM_TOP].y = v_orig;
phantoms[PHANTOM_BOTTOM].y = -v_adv + v_orig;
}
/* for a simple glyph, return contour end points, flags, along with coordinate points
@ -653,7 +653,7 @@ struct glyf
* Shift points horizontally by the updated left side bearing
*/
contour_point_t delta;
delta.init (points[points.length - PHANTOM_COUNT + PHANTOM_LEFT].x, 0.f);
delta.init (-points[points.length - PHANTOM_COUNT + PHANTOM_LEFT].x, 0.f);
if (delta.x != 0.f) all_points.translate (delta);
}
@ -901,9 +901,11 @@ struct glyf
const GlyphHeader &glyph_header = StructAtOffset<GlyphHeader> (glyf_table, start_offset);
extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax);
/* Undocumented rasterizer behavior: shift glyph to the left by (lsb - xMin), i.e., xMin = lsb */
/* extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax); */
extents->x_bearing = hmtx_accel.get_side_bearing (glyph);
extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax);
extents->width = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing;
extents->width = MAX (glyph_header.xMin, glyph_header.xMax) - MIN (glyph_header.xMin, glyph_header.xMax);
extents->height = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing;
return true;