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

[glyf] minor

This commit is contained in:
Ebrahim Byagowi 2019-10-07 11:14:26 +03:30
parent cbefbb2439
commit 7839e23558
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,22 +305,21 @@ struct glyf
hb_bytes_t bytes_without_padding (hb_bytes_t glyph_bytes) const hb_bytes_t bytes_without_padding (hb_bytes_t glyph_bytes) const
{ {
unsigned int end_offset = glyph_bytes.length; /* based on FontTools _g_l_y_f.py::trim */
/* based on FontTools _g_l_y_f.py::trim */ const char *glyph = glyph_bytes.arrayZ;
const char *glyph = glyph_bytes.arrayZ; const char *glyph_end = glyph + glyph_bytes.length;
const char *glyph_end = glyph + glyph_bytes.length;
/* simple glyph w/contours, possibly trimmable */ /* simple glyph w/contours, possibly trimmable */
glyph += instruction_len_offset (); glyph += instruction_len_offset ();
if (unlikely (glyph + 2 >= glyph_end)) return hb_bytes_t (); if (unlikely (glyph + 2 >= glyph_end)) return hb_bytes_t ();
unsigned int nCoordinates = StructAtOffset<HBUINT16> (glyph - 2, 0) + 1; unsigned int num_coordinates = StructAtOffset<HBUINT16> (glyph - 2, 0) + 1;
unsigned int nInstructions = StructAtOffset<HBUINT16> (glyph, 0); unsigned int num_instructions = StructAtOffset<HBUINT16> (glyph, 0);
glyph += 2 + nInstructions; glyph += 2 + num_instructions;
if (unlikely (glyph + 2 >= glyph_end)) return hb_bytes_t (); if (unlikely (glyph + 2 >= glyph_end)) return hb_bytes_t ();
unsigned int coordBytes = 0; unsigned int coord_bytes = 0;
unsigned int coordsWithFlags = 0; unsigned int coords_with_flags = 0;
while (glyph < glyph_end) while (glyph < glyph_end)
{ {
uint8_t flag = *glyph; uint8_t flag = *glyph;
@ -342,17 +341,13 @@ struct glyf
if (flag & FLAG_Y_SHORT) yBytes = 1; if (flag & FLAG_Y_SHORT) yBytes = 1;
else if ((flag & FLAG_Y_SAME) == 0) yBytes = 2; else if ((flag & FLAG_Y_SAME) == 0) yBytes = 2;
coordBytes += (xBytes + yBytes) * repeat; coord_bytes += (xBytes + yBytes) * repeat;
coordsWithFlags += repeat; coords_with_flags += repeat;
if (coordsWithFlags >= nCoordinates) break; if (coords_with_flags >= num_coordinates) break;
} }
if (unlikely (coordsWithFlags != nCoordinates)) return hb_bytes_t (); if (unlikely (coords_with_flags != num_coordinates)) return hb_bytes_t ();
glyph += coordBytes; return glyph_bytes.sub_array (0, glyph_bytes.length + coord_bytes - (glyph_end - glyph));
if (glyph < glyph_end)
end_offset -= glyph_end - glyph;
return glyph_bytes.sub_array (0, end_offset);
} }
}; };
@ -380,7 +375,7 @@ struct glyf
/* Trimming for composites not implemented. /* Trimming for composites not implemented.
* If removing hints it falls out of that. */ * If removing hints it falls out of that. */
hb_bytes_t bytes_without_padding (hb_bytes_t glyph_bytes) const hb_bytes_t bytes_without_padding (hb_bytes_t glyph_bytes) const
{ return glyph_bytes; } { return glyph_bytes; }
}; };
const SimpleHeader as_simple () const { return SimpleHeader (*this); } const SimpleHeader as_simple () const { return SimpleHeader (*this); }
@ -913,11 +908,9 @@ struct glyf
extents->height = font->em_scalef_y (bounds.min.y) - extents->y_bearing; extents->height = font->em_scalef_y (bounds.min.y) - extents->y_bearing;
} }
} }
if (phantoms != nullptr) if (phantoms)
{
for (unsigned int i = 0; i < PHANTOM_COUNT; i++) for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
(*phantoms)[i] = all_points[all_points.length - PHANTOM_COUNT + i]; (*phantoms)[i] = all_points[all_points.length - PHANTOM_COUNT + i];
}
return true; return true;
} }
@ -1032,7 +1025,6 @@ struct glyf
hb_face_t *face; hb_face_t *face;
}; };
struct SubsetGlyph struct SubsetGlyph
{ {
hb_codepoint_t new_gid; hb_codepoint_t new_gid;