summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-10-28 23:44:53 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-10-28 23:44:53 +0000
commit65b88a70ed4a3b2ee8da094d317b3d8119aec1d7 (patch)
tree9b8c76c1afc603f7bcb0377efabd7b06cdd43e5d /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh
parent1631aaed733bf2365f99084b46113a982d918ebc (diff)
harfbuzz-2.6.3
git-svn-id: svn://tug.org/texlive/trunk@52560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh1073
1 files changed, 721 insertions, 352 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh
index 9a791bbf031..f5a64b050e8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh
@@ -1,5 +1,6 @@
/*
* Copyright © 2015 Google, Inc.
+ * Copyright © 2019 Adobe Inc.
* Copyright © 2019 Ebrahim Byagowi
*
* This is part of HarfBuzz, a text shaping library.
@@ -23,6 +24,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*
* Google Author(s): Behdad Esfahbod, Garret Rieger, Roderick Sheeter
+ * Adobe Author(s): Michiharu Ariza
*/
#ifndef HB_OT_GLYF_TABLE_HH
@@ -30,6 +32,10 @@
#include "hb-open-type.hh"
#include "hb-ot-head-table.hh"
+#include "hb-ot-hmtx-table.hh"
+#include "hb-ot-var-gvar-table.hh"
+
+#include <float.h>
namespace OT {
@@ -57,7 +63,7 @@ struct loca
UnsizedArrayOf<HBUINT8>
dataZ; /* Location data. */
public:
- DEFINE_SIZE_MIN (0); /* In reality, this is UNBOUNDED() type; but since we always
+ DEFINE_SIZE_MIN (0); /* In reality, this is UNBOUNDED() type; but since we always
* check the size externally, allow Null() object of it by
* defining it _MIN instead. */
};
@@ -77,8 +83,7 @@ struct glyf
bool sanitize (hb_sanitize_context_t *c HB_UNUSED) const
{
TRACE_SANITIZE (this);
- /* We don't check for anything specific here. The users of the
- * struct do all the hard work... */
+ /* Runtime checks as eager sanitizing each glyph is costy */
return_trace (true);
}
@@ -111,7 +116,7 @@ struct glyf
free);
bool result = plan->add_table (HB_OT_TAG_loca, loca_blob)
- && _add_head_and_set_loca_version(plan, use_short_loca);
+ && _add_head_and_set_loca_version (plan, use_short_loca);
hb_blob_destroy (loca_blob);
return result;
@@ -136,7 +141,7 @@ struct glyf
;
}
- // requires source of SubsetGlyph complains the identifier isn't declared
+ /* requires source of SubsetGlyph complains the identifier isn't declared */
template <typename Iterator>
bool serialize (hb_serialize_context_t *c,
Iterator it,
@@ -147,6 +152,9 @@ struct glyf
return_trace (true);
}
+ /* Byte region(s) per glyph to output
+ unpadded, hints removed if so requested
+ If we fail to process a glyph we produce an empty (0-length) glyph */
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
@@ -154,9 +162,6 @@ struct glyf
glyf *glyf_prime = c->serializer->start_embed <glyf> ();
if (unlikely (!c->serializer->check_success (glyf_prime))) return_trace (false);
- // Byte region(s) per glyph to output
- // unpadded, hints removed if so requested
- // If we fail to process a glyph we produce an empty (0-length) glyph
hb_vector_t<SubsetGlyph> glyphs;
_populate_subset_glyphs (c->plan, &glyphs);
@@ -174,8 +179,8 @@ struct glyf
template <typename SubsetGlyph>
void
- _populate_subset_glyphs (const hb_subset_plan_t * plan,
- hb_vector_t<SubsetGlyph> * glyphs /* OUT */) const
+ _populate_subset_glyphs (const hb_subset_plan_t *plan,
+ hb_vector_t<SubsetGlyph> *glyphs /* OUT */) const
{
OT::glyf::accelerator_t glyf;
glyf.init (plan->source);
@@ -186,14 +191,13 @@ struct glyf
SubsetGlyph subset_glyph = {0};
subset_glyph.new_gid = new_gid;
- // should never fail: all old gids should be mapped
+ /* should never fail: all old gids should be mapped */
if (!plan->old_gid_for_new_gid (new_gid, &subset_glyph.old_gid))
return subset_glyph;
- subset_glyph.source_glyph = glyf.bytes_for_glyph ((const char *) this,
- subset_glyph.old_gid);
- if (plan->drop_hints) subset_glyph.drop_hints (glyf);
- else subset_glyph.dest_start = subset_glyph.source_glyph;
+ subset_glyph.source_glyph = glyf.glyph_for_gid (subset_glyph.old_gid, true);
+ if (plan->drop_hints) subset_glyph.drop_hints_bytes ();
+ else subset_glyph.dest_start = subset_glyph.source_glyph.get_bytes ();
return subset_glyph;
})
@@ -203,58 +207,6 @@ struct glyf
glyf.fini ();
}
- static void
- _fix_component_gids (const hb_subset_plan_t *plan,
- hb_bytes_t glyph)
- {
- OT::glyf::CompositeGlyphHeader::Iterator iterator;
- if (OT::glyf::CompositeGlyphHeader::get_iterator (&glyph,
- glyph.length,
- &iterator))
- {
- do
- {
- hb_codepoint_t new_gid;
- if (!plan->new_gid_for_old_gid (iterator.current->glyphIndex,
- &new_gid))
- continue;
- ((OT::glyf::CompositeGlyphHeader *) iterator.current)->glyphIndex = new_gid;
- } while (iterator.move_to_next ());
- }
- }
-
- static void
- _zero_instruction_length (hb_bytes_t glyph)
- {
- const GlyphHeader &glyph_header = *glyph.as<GlyphHeader> ();
- if (!glyph_header.is_simple_glyph ()) return; // only for simple glyphs
-
- unsigned int instruction_len_offset = glyph_header.simple_instruction_len_offset ();
- const HBUINT16 &instruction_len = StructAtOffset<HBUINT16> (&glyph,
- instruction_len_offset);
- (HBUINT16 &) instruction_len = 0;
- }
-
- static bool _remove_composite_instruction_flag (hb_bytes_t glyph)
- {
- const GlyphHeader &glyph_header = *glyph.as<GlyphHeader> ();
- if (!glyph_header.is_composite_glyph ()) return true; // only for composites
-
- /* remove WE_HAVE_INSTRUCTIONS from flags in dest */
- OT::glyf::CompositeGlyphHeader::Iterator composite_it;
- if (unlikely (!OT::glyf::CompositeGlyphHeader::get_iterator (&glyph, glyph.length,
- &composite_it)))
- return false;
- const OT::glyf::CompositeGlyphHeader *composite_header;
- do
- {
- composite_header = composite_it.current;
- OT::HBUINT16 *flags = const_cast<OT::HBUINT16 *> (&composite_header->flags);
- *flags = (uint16_t) *flags & ~OT::glyf::CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS;
- } while (composite_it.move_to_next ());
- return true;
- }
-
static bool
_add_head_and_set_loca_version (hb_subset_plan_t *plan, bool use_short_loca)
{
@@ -273,41 +225,7 @@ struct glyf
return success;
}
- struct GlyphHeader
- {
- unsigned int simple_instruction_len_offset () const
- { return static_size + 2 * numberOfContours; }
-
- unsigned int simple_length (unsigned int instruction_len) const
- { return simple_instruction_len_offset () + 2 + instruction_len; }
-
- bool is_composite_glyph () const { return numberOfContours < 0; }
- bool is_simple_glyph () const { return numberOfContours > 0; }
-
- void get_extents (hb_glyph_extents_t *extents) const
- {
- extents->x_bearing = hb_min (xMin, xMax);
- extents->y_bearing = hb_max (yMin, yMax);
- extents->width = hb_max (xMin, xMax) - extents->x_bearing;
- extents->height = hb_min (yMin, yMax) - extents->y_bearing;
- }
-
- bool has_data () const { return numberOfContours; }
-
- protected:
- HBINT16 numberOfContours;/* If the number of contours is
- * greater than or equal to zero,
- * this is a simple glyph; if negative,
- * this is a composite glyph. */
- FWORD xMin; /* Minimum x for coordinate data. */
- FWORD yMin; /* Minimum y for coordinate data. */
- FWORD xMax; /* Maximum x for coordinate data. */
- FWORD yMax; /* Maximum y for coordinate data. */
- public:
- DEFINE_SIZE_STATIC (10);
- };
-
- struct CompositeGlyphHeader
+ struct CompositeGlyphChain
{
enum composite_glyph_flag_t
{
@@ -325,180 +243,248 @@ struct glyf
UNSCALED_COMPONENT_OFFSET = 0x1000
};
- HBUINT16 flags;
- HBGlyphID glyphIndex;
-
unsigned int get_size () const
{
unsigned int size = min_size;
- // arg1 and 2 are int16
+ /* arg1 and 2 are int16 */
if (flags & ARG_1_AND_2_ARE_WORDS) size += 4;
- // arg1 and 2 are int8
+ /* arg1 and 2 are int8 */
else size += 2;
- // One x 16 bit (scale)
+ /* One x 16 bit (scale) */
if (flags & WE_HAVE_A_SCALE) size += 2;
- // Two x 16 bit (xscale, yscale)
+ /* Two x 16 bit (xscale, yscale) */
else if (flags & WE_HAVE_AN_X_AND_Y_SCALE) size += 4;
- // Four x 16 bit (xscale, scale01, scale10, yscale)
+ /* Four x 16 bit (xscale, scale01, scale10, yscale) */
else if (flags & WE_HAVE_A_TWO_BY_TWO) size += 8;
return size;
}
- // TODO rewrite using new iterator framework if possible
- struct Iterator
+ bool is_use_my_metrics () const { return flags & USE_MY_METRICS; }
+ bool is_anchored () const { return !(flags & ARGS_ARE_XY_VALUES); }
+ void get_anchor_points (unsigned int &point1, unsigned int &point2) const
{
- const char *glyph_start;
- const char *glyph_end;
- const CompositeGlyphHeader *current;
+ const HBUINT8 *p = &StructAfter<const HBUINT8> (glyphIndex);
+ if (flags & ARG_1_AND_2_ARE_WORDS)
+ {
+ point1 = ((const HBUINT16 *) p)[0];
+ point2 = ((const HBUINT16 *) p)[1];
+ }
+ else
+ {
+ point1 = p[0];
+ point2 = p[1];
+ }
+ }
- bool move_to_next ()
+ void transform_points (contour_point_vector_t &points) const
+ {
+ float matrix[4];
+ contour_point_t trans;
+ if (get_transformation (matrix, trans))
{
- if (current->flags & CompositeGlyphHeader::MORE_COMPONENTS)
+ if (scaled_offsets ())
{
- const CompositeGlyphHeader *possible =
- &StructAfter<CompositeGlyphHeader, CompositeGlyphHeader> (*current);
- if (!in_range (possible))
- return false;
- current = possible;
- return true;
+ points.translate (trans);
+ points.transform (matrix);
+ }
+ else
+ {
+ points.transform (matrix);
+ points.translate (trans);
}
- return false;
}
+ }
- bool in_range (const CompositeGlyphHeader *composite) const
- {
- return (const char *) composite >= glyph_start
- && ((const char *) composite + CompositeGlyphHeader::min_size) <= glyph_end
- && ((const char *) composite + composite->get_size ()) <= glyph_end;
- }
- };
+ protected:
+ bool scaled_offsets () const
+ { return (flags & (SCALED_COMPONENT_OFFSET | UNSCALED_COMPONENT_OFFSET)) == SCALED_COMPONENT_OFFSET; }
- static bool get_iterator (const char * glyph_data,
- unsigned int length,
- CompositeGlyphHeader::Iterator *iterator /* OUT */)
+ bool get_transformation (float (&matrix)[4], contour_point_t &trans) const
{
- const GlyphHeader &glyph_header = *hb_bytes_t (glyph_data, length).as<GlyphHeader> ();
- if (!glyph_header.has_data ()) return false; /* Empty glyph; zero extents. */
+ matrix[0] = matrix[3] = 1.f;
+ matrix[1] = matrix[2] = 0.f;
- if (glyph_header.is_composite_glyph ())
+ int tx, ty;
+ const HBINT8 *p = &StructAfter<const HBINT8> (glyphIndex);
+ if (flags & ARG_1_AND_2_ARE_WORDS)
{
- const CompositeGlyphHeader *possible =
- &StructAfter<CompositeGlyphHeader, GlyphHeader> (glyph_header);
-
- iterator->glyph_start = glyph_data;
- iterator->glyph_end = (const char *) glyph_data + length;
- if (!iterator->in_range (possible))
- return false;
- iterator->current = possible;
- return true;
+ tx = *(const HBINT16 *) p;
+ p += HBINT16::static_size;
+ ty = *(const HBINT16 *) p;
+ p += HBINT16::static_size;
+ }
+ else
+ {
+ tx = *p++;
+ ty = *p++;
}
+ if (is_anchored ()) tx = ty = 0;
- return false;
+ trans.init ((float) tx, (float) ty);
+
+ {
+ const F2DOT14 *points = (const F2DOT14 *) p;
+ if (flags & WE_HAVE_A_SCALE)
+ {
+ matrix[0] = matrix[3] = points[0].to_float ();
+ return true;
+ }
+ else if (flags & WE_HAVE_AN_X_AND_Y_SCALE)
+ {
+ matrix[0] = points[0].to_float ();
+ matrix[3] = points[1].to_float ();
+ return true;
+ }
+ else if (flags & WE_HAVE_A_TWO_BY_TWO)
+ {
+ matrix[0] = points[0].to_float ();
+ matrix[1] = points[1].to_float ();
+ matrix[2] = points[2].to_float ();
+ matrix[3] = points[3].to_float ();
+ return true;
+ }
+ }
+ return tx || ty;
}
+ public:
+ HBUINT16 flags;
+ HBGlyphID glyphIndex;
+ public:
DEFINE_SIZE_MIN (4);
};
- struct accelerator_t
+ struct composite_iter_t : hb_iter_with_fallback_t<composite_iter_t, const CompositeGlyphChain &>
{
- void init (hb_face_t *face)
+ typedef const CompositeGlyphChain *__item_t__;
+ composite_iter_t (hb_bytes_t glyph_, __item_t__ current_) :
+ glyph (glyph_), current (current_), checker (range_checker_t (glyph.arrayZ, glyph.length))
+ { if (!in_range (current)) current = nullptr; }
+ composite_iter_t () : glyph (hb_bytes_t ()), current (nullptr), checker (range_checker_t (nullptr, 0)) {}
+
+ const CompositeGlyphChain &__item__ () const { return *current; }
+ bool __more__ () const { return current; }
+ void __next__ ()
{
- memset (this, 0, sizeof (accelerator_t));
-
- const OT::head &head = *face->table.head;
- if (head.indexToLocFormat > 1 || head.glyphDataFormat != 0)
- /* Unknown format. Leave num_glyphs=0, that takes care of disabling us. */
- return;
- short_offset = 0 == head.indexToLocFormat;
-
- loca_table = hb_sanitize_context_t ().reference_table<loca> (face);
- glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
+ if (!(current->flags & CompositeGlyphChain::MORE_COMPONENTS)) { current = nullptr; return; }
- num_glyphs = hb_max (1u, loca_table.get_length () / (short_offset ? 2 : 4)) - 1;
+ const CompositeGlyphChain *possible = &StructAfter<CompositeGlyphChain,
+ CompositeGlyphChain> (*current);
+ if (!in_range (possible)) { current = nullptr; return; }
+ current = possible;
}
+ bool operator != (const composite_iter_t& o) const
+ { return glyph != o.glyph || current != o.current; }
- void fini ()
+ bool in_range (const CompositeGlyphChain *composite) const
{
- loca_table.destroy ();
- glyf_table.destroy ();
+ return checker.in_range (composite, CompositeGlyphChain::min_size)
+ && checker.in_range (composite, composite->get_size ());
}
- /*
- * Returns true if the referenced glyph is a valid glyph and a composite glyph.
- * If true is returned a pointer to the composite glyph will be written into
- * composite.
- */
- bool get_composite (hb_codepoint_t glyph,
- CompositeGlyphHeader::Iterator *composite /* OUT */) const
+ private:
+ hb_bytes_t glyph;
+ __item_t__ current;
+ range_checker_t checker;
+ };
+
+ struct Glyph
+ {
+ private:
+ struct GlyphHeader
{
- if (unlikely (!num_glyphs))
- return false;
+ bool has_data () const { return numberOfContours; }
- unsigned int start_offset, end_offset;
- if (!get_offsets (glyph, &start_offset, &end_offset))
- return false; /* glyph not found */
+ bool get_extents (hb_font_t *font, hb_codepoint_t gid, hb_glyph_extents_t *extents) const
+ {
+ /* Undocumented rasterizer behavior: shift glyph to the left by (lsb - xMin), i.e., xMin = lsb */
+ /* extents->x_bearing = hb_min (glyph_header.xMin, glyph_header.xMax); */
+ extents->x_bearing = font->em_scale_x (font->face->table.hmtx->get_side_bearing (gid));
+ extents->y_bearing = font->em_scale_y (hb_max (yMin, yMax));
+ extents->width = font->em_scale_x (hb_max (xMin, xMax) - hb_min (xMin, xMax));
+ extents->height = font->em_scale_y (hb_min (yMin, yMax) - hb_max (yMin, yMax));
- return CompositeGlyphHeader::get_iterator ((const char *) this->glyf_table + start_offset,
- end_offset - start_offset,
- composite);
- }
+ return true;
+ }
- enum simple_glyph_flag_t
- {
- FLAG_ON_CURVE = 0x01,
- FLAG_X_SHORT = 0x02,
- FLAG_Y_SHORT = 0x04,
- FLAG_REPEAT = 0x08,
- FLAG_X_SAME = 0x10,
- FLAG_Y_SAME = 0x20,
- FLAG_RESERVED1 = 0x40,
- FLAG_RESERVED2 = 0x80
+ HBINT16 numberOfContours;
+ /* If the number of contours is
+ * greater than or equal to zero,
+ * this is a simple glyph; if negative,
+ * this is a composite glyph. */
+ FWORD xMin; /* Minimum x for coordinate data. */
+ FWORD yMin; /* Minimum y for coordinate data. */
+ FWORD xMax; /* Maximum x for coordinate data. */
+ FWORD yMax; /* Maximum y for coordinate data. */
+ public:
+ DEFINE_SIZE_STATIC (10);
};
- /* based on FontTools _g_l_y_f.py::trim */
- bool remove_padding (unsigned int start_offset,
- unsigned int *end_offset) const
+ struct SimpleGlyph
{
- const char *glyph = ((const char *) glyf_table) + start_offset;
- unsigned int glyph_length = *end_offset - start_offset;
- const GlyphHeader &glyph_header = *hb_bytes_t (glyph, glyph_length).as<GlyphHeader> ();
- if (!glyph_header.has_data ()) return true;
+ const GlyphHeader &header;
+ hb_bytes_t bytes;
+ SimpleGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) :
+ header (header_), bytes (bytes_) {}
- const char *glyph_end = glyph + glyph_length;
- if (glyph_header.is_composite_glyph ())
- /* Trimming for composites not implemented.
- * If removing hints it falls out of that. */
- return true;
- else
+ unsigned int instruction_len_offset () const
+ { return GlyphHeader::static_size + 2 * header.numberOfContours; }
+
+ unsigned int length (unsigned int instruction_len) const
+ { return instruction_len_offset () + 2 + instruction_len; }
+
+ unsigned int instructions_length () const
+ {
+ unsigned int instruction_length_offset = instruction_len_offset ();
+ if (unlikely (instruction_length_offset + 2 > bytes.length)) return 0;
+
+ const HBUINT16 &instructionLength = StructAtOffset<HBUINT16> (&bytes, instruction_length_offset);
+ /* Out of bounds of the current glyph */
+ if (unlikely (length (instructionLength) > bytes.length)) return 0;
+ return instructionLength;
+ }
+
+ enum simple_glyph_flag_t
{
+ FLAG_ON_CURVE = 0x01,
+ FLAG_X_SHORT = 0x02,
+ FLAG_Y_SHORT = 0x04,
+ FLAG_REPEAT = 0x08,
+ FLAG_X_SAME = 0x10,
+ FLAG_Y_SAME = 0x20,
+ FLAG_RESERVED1 = 0x40,
+ FLAG_RESERVED2 = 0x80
+ };
+
+ const Glyph trim_padding () const
+ {
+ /* based on FontTools _g_l_y_f.py::trim */
+ const char *glyph = bytes.arrayZ;
+ const char *glyph_end = glyph + bytes.length;
/* simple glyph w/contours, possibly trimmable */
- glyph += glyph_header.simple_instruction_len_offset ();
+ glyph += instruction_len_offset ();
- if (unlikely (glyph + 2 >= glyph_end)) return false;
- uint16_t nCoordinates = (uint16_t) StructAtOffset<HBUINT16> (glyph - 2, 0) + 1;
- uint16_t nInstructions = (uint16_t) StructAtOffset<HBUINT16> (glyph, 0);
+ if (unlikely (glyph + 2 >= glyph_end)) return Glyph ();
+ unsigned int num_coordinates = StructAtOffset<HBUINT16> (glyph - 2, 0) + 1;
+ unsigned int num_instructions = StructAtOffset<HBUINT16> (glyph, 0);
- glyph += 2 + nInstructions;
- if (unlikely (glyph + 2 >= glyph_end)) return false;
+ glyph += 2 + num_instructions;
+ if (unlikely (glyph + 2 >= glyph_end)) return Glyph ();
- unsigned int coordBytes = 0;
- unsigned int coordsWithFlags = 0;
+ unsigned int coord_bytes = 0;
+ unsigned int coords_with_flags = 0;
while (glyph < glyph_end)
{
- uint8_t flag = (uint8_t) *glyph;
+ uint8_t flag = *glyph;
glyph++;
unsigned int repeat = 1;
if (flag & FLAG_REPEAT)
{
- if (glyph >= glyph_end)
- {
- DEBUG_MSG (SUBSET, nullptr, "Bad flag");
- return false;
- }
- repeat = ((uint8_t) *glyph) + 1;
+ if (unlikely (glyph >= glyph_end)) return Glyph ();
+ repeat = *glyph + 1;
glyph++;
}
@@ -510,141 +496,553 @@ struct glyf
if (flag & FLAG_Y_SHORT) yBytes = 1;
else if ((flag & FLAG_Y_SAME) == 0) yBytes = 2;
- coordBytes += (xBytes + yBytes) * repeat;
- coordsWithFlags += repeat;
- if (coordsWithFlags >= nCoordinates)
- break;
+ coord_bytes += (xBytes + yBytes) * repeat;
+ coords_with_flags += repeat;
+ if (coords_with_flags >= num_coordinates) break;
}
- if (coordsWithFlags != nCoordinates)
+ if (unlikely (coords_with_flags != num_coordinates)) return Glyph ();
+ return Glyph (bytes.sub_array (0, bytes.length + coord_bytes - (glyph_end - glyph)));
+ }
+
+ /* zero instruction length */
+ void drop_hints ()
+ {
+ GlyphHeader &glyph_header = const_cast<GlyphHeader &> (header);
+ (HBUINT16 &) StructAtOffset<HBUINT16> (&glyph_header, instruction_len_offset ()) = 0;
+ }
+
+ void drop_hints_bytes (hb_bytes_t &dest_start, hb_bytes_t &dest_end) const
+ {
+ unsigned int instructions_len = instructions_length ();
+ unsigned int glyph_length = length (instructions_len);
+ dest_start = bytes.sub_array (0, glyph_length - instructions_len);
+ dest_end = bytes.sub_array (glyph_length, bytes.length - glyph_length);
+ }
+
+ struct x_setter_t
+ {
+ void set (contour_point_t &point, float v) const { point.x = v; }
+ bool is_short (uint8_t flag) const { return flag & FLAG_X_SHORT; }
+ bool is_same (uint8_t flag) const { return flag & FLAG_X_SAME; }
+ };
+
+ struct y_setter_t
+ {
+ void set (contour_point_t &point, float v) const { point.y = v; }
+ bool is_short (uint8_t flag) const { return flag & FLAG_Y_SHORT; }
+ bool is_same (uint8_t flag) const { return flag & FLAG_Y_SAME; }
+ };
+
+ template <typename T>
+ static bool read_points (const HBUINT8 *&p /* IN/OUT */,
+ contour_point_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++)
{
- DEBUG_MSG (SUBSET, nullptr, "Expect %d coords to have flags, got flags for %d",
- nCoordinates, coordsWithFlags);
- return false;
+ uint8_t flag = points_[i].flag;
+ if (coord_setter.is_short (flag))
+ {
+ if (unlikely (!checker.in_range (p))) return false;
+ if (coord_setter.is_same (flag))
+ v += *p++;
+ else
+ v -= *p++;
+ }
+ else
+ {
+ if (!coord_setter.is_same (flag))
+ {
+ if (unlikely (!checker.in_range ((const HBUINT16 *) p))) return false;
+ v += *(const HBINT16 *) p;
+ p += HBINT16::static_size;
+ }
+ }
+ coord_setter.set (points_[i], v);
}
- glyph += coordBytes;
+ return true;
+ }
+
+ bool get_contour_points (contour_point_vector_t &points_ /* OUT */,
+ hb_vector_t<unsigned int> &end_points_ /* OUT */,
+ const bool phantom_only=false) const
+ {
+ const HBUINT16 *endPtsOfContours = &StructAfter<HBUINT16> (header);
+ range_checker_t checker (bytes.arrayZ, bytes.length);
+ int num_contours = header.numberOfContours;
+ if (unlikely (!checker.in_range (&endPtsOfContours[num_contours + 1]))) return false;
+ unsigned int num_points = endPtsOfContours[num_contours - 1] + 1;
+
+ points_.resize (num_points + PHANTOM_COUNT);
+ for (unsigned int i = 0; i < points_.length; i++) points_[i].init ();
+ if (phantom_only) return true;
- if (glyph < glyph_end)
- *end_offset -= glyph_end - glyph;
+ /* Read simple glyph points if !phantom_only */
+ end_points_.resize (num_contours);
+
+ for (int i = 0; i < num_contours; i++)
+ end_points_[i] = endPtsOfContours[i];
+
+ /* Skip instructions */
+ const HBUINT8 *p = &StructAtOffset<HBUINT8> (&endPtsOfContours[num_contours + 1],
+ endPtsOfContours[num_contours]);
+
+ /* Read flags */
+ for (unsigned int i = 0; i < num_points; i++)
+ {
+ if (unlikely (!checker.in_range (p))) return false;
+ uint8_t flag = *p++;
+ points_[i].flag = flag;
+ if (flag & FLAG_REPEAT)
+ {
+ if (unlikely (!checker.in_range (p))) return false;
+ unsigned int repeat_count = *p++;
+ while ((repeat_count-- > 0) && (++i < num_points))
+ points_[i].flag = flag;
+ }
+ }
+
+ /* Read x & y coordinates */
+ return (read_points<x_setter_t> (p, points_, checker) &&
+ read_points<y_setter_t> (p, points_, checker));
}
- return true;
- }
+ };
- bool get_offsets (hb_codepoint_t glyph,
- unsigned int *start_offset /* OUT */,
- unsigned int *end_offset /* OUT */) const
+ struct CompositeGlyph
{
- if (unlikely (glyph >= num_glyphs))
- return false;
+ const GlyphHeader &header;
+ hb_bytes_t bytes;
+ CompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) :
+ header (header_), bytes (bytes_) {}
- if (short_offset)
+ composite_iter_t get_iterator () const
+ { return composite_iter_t (bytes, &StructAfter<CompositeGlyphChain, GlyphHeader> (header)); }
+
+ unsigned int instructions_length (hb_bytes_t bytes) const
{
- const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataZ.arrayZ;
- *start_offset = 2 * offsets[glyph];
- *end_offset = 2 * offsets[glyph + 1];
+ unsigned int start = bytes.length;
+ unsigned int end = bytes.length;
+ const CompositeGlyphChain *last = nullptr;
+ for (auto &item : get_iterator ())
+ last = &item;
+ if (unlikely (!last)) return 0;
+
+ if ((uint16_t) last->flags & CompositeGlyphChain::WE_HAVE_INSTRUCTIONS)
+ start = (char *) last - &bytes + last->get_size ();
+ if (unlikely (start > end)) return 0;
+ return end - start;
}
- else
+
+ /* Trimming for composites not implemented.
+ * If removing hints it falls out of that. */
+ const Glyph trim_padding () const { return Glyph (bytes); }
+
+ /* remove WE_HAVE_INSTRUCTIONS flag from composite glyph */
+ void drop_hints ()
{
- const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataZ.arrayZ;
+ for (const auto &_ : get_iterator ())
+ *const_cast<OT::HBUINT16 *> (&_.flags) = (uint16_t) _.flags & ~OT::glyf::CompositeGlyphChain::WE_HAVE_INSTRUCTIONS;
+ }
+
+ /* Chop instructions off the end */
+ void drop_hints_bytes (hb_bytes_t &dest_start) const
+ { dest_start = bytes.sub_array (0, bytes.length - instructions_length (bytes)); }
+
+ bool get_contour_points (contour_point_vector_t &points_ /* OUT */,
+ hb_vector_t<unsigned int> &end_points_ /* OUT */,
+ const bool phantom_only=false) const
+ {
+ /* add one pseudo point for each component in composite glyph */
+ unsigned int num_points = hb_len (get_iterator ());
+ points_.resize (num_points + PHANTOM_COUNT);
+ for (unsigned int i = 0; i < points_.length; i++) points_[i].init ();
+ return true;
+ }
+ };
+
+ enum glyph_type_t { EMPTY, SIMPLE, COMPOSITE };
- *start_offset = offsets[glyph];
- *end_offset = offsets[glyph + 1];
+ enum phantom_point_index_t
+ {
+ PHANTOM_LEFT = 0,
+ PHANTOM_RIGHT = 1,
+ PHANTOM_TOP = 2,
+ PHANTOM_BOTTOM = 3,
+ PHANTOM_COUNT = 4
+ };
+
+ public:
+ composite_iter_t get_composite_iterator () const
+ {
+ if (type != COMPOSITE) return composite_iter_t ();
+ return CompositeGlyph (*header, bytes).get_iterator ();
+ }
+
+ const Glyph trim_padding () const
+ {
+ switch (type) {
+ case COMPOSITE: return CompositeGlyph (*header, bytes).trim_padding ();
+ case SIMPLE: return SimpleGlyph (*header, bytes).trim_padding ();
+ default: return bytes;
}
+ }
- if (*start_offset > *end_offset || *end_offset > glyf_table.get_length ())
- return false;
+ void drop_hints ()
+ {
+ switch (type) {
+ case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints (); return;
+ case SIMPLE: SimpleGlyph (*header, bytes).drop_hints (); return;
+ default: return;
+ }
+ }
- return true;
+ void drop_hints_bytes (hb_bytes_t &dest_start, hb_bytes_t &dest_end) const
+ {
+ switch (type) {
+ case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints_bytes (dest_start); return;
+ case SIMPLE: SimpleGlyph (*header, bytes).drop_hints_bytes (dest_start, dest_end); return;
+ default: return;
+ }
+ }
+
+ /* for a simple glyph, return contour end points, flags, along with coordinate points
+ * for a composite glyph, return pseudo component points
+ * in both cases points trailed with four phantom points
+ */
+ bool get_contour_points (contour_point_vector_t &points_ /* OUT */,
+ hb_vector_t<unsigned int> &end_points_ /* OUT */,
+ const bool phantom_only=false) const
+ {
+ switch (type) {
+ case COMPOSITE: return CompositeGlyph (*header, bytes).get_contour_points (points_, end_points_, phantom_only);
+ case SIMPLE: return SimpleGlyph (*header, bytes).get_contour_points (points_, end_points_, phantom_only);
+ default:
+ /* empty glyph */
+ points_.resize (PHANTOM_COUNT);
+ for (unsigned int i = 0; i < points_.length; i++) points_[i].init ();
+ return true;
+ }
}
- bool get_instruction_length (hb_bytes_t glyph,
- unsigned int * length /* OUT */) const
+ bool is_simple_glyph () const { return type == SIMPLE; }
+ bool is_composite_glyph () const { return type == COMPOSITE; }
+
+ bool get_extents (hb_font_t *font, hb_codepoint_t gid, hb_glyph_extents_t *extents) const
{
- const GlyphHeader &glyph_header = *glyph.as<GlyphHeader> ();
- /* Empty glyph; no instructions. */
- if (!glyph_header.has_data ())
+ if (type == EMPTY) return true; /* Empty glyph; zero extents. */
+ return header->get_extents (font, gid, extents);
+ }
+
+ hb_bytes_t get_bytes () const { return bytes; }
+ const GlyphHeader &get_header () const { return *header; }
+
+ Glyph (hb_bytes_t bytes_ = hb_bytes_t ()) :
+ bytes (bytes_), header (bytes.as<GlyphHeader> ())
+ {
+ int num_contours = header->numberOfContours;
+ if (unlikely (num_contours == 0)) type = EMPTY;
+ else if (num_contours > 0) type = SIMPLE;
+ else type = COMPOSITE; /* negative numbers */
+ }
+
+ protected:
+ hb_bytes_t bytes;
+ const GlyphHeader *header;
+ unsigned type;
+ };
+
+ struct accelerator_t
+ {
+ void init (hb_face_t *face_)
+ {
+ short_offset = false;
+ num_glyphs = 0;
+ loca_table = nullptr;
+ glyf_table = nullptr;
+ face = face_;
+ const OT::head &head = *face->table.head;
+ if (head.indexToLocFormat > 1 || head.glyphDataFormat > 0)
+ /* Unknown format. Leave num_glyphs=0, that takes care of disabling us. */
+ return;
+ short_offset = 0 == head.indexToLocFormat;
+
+ loca_table = hb_sanitize_context_t ().reference_table<loca> (face);
+ glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
+
+ num_glyphs = hb_max (1u, loca_table.get_length () / (short_offset ? 2 : 4)) - 1;
+ }
+
+ void fini ()
+ {
+ loca_table.destroy ();
+ glyf_table.destroy ();
+ }
+
+ enum phantom_point_index_t
+ {
+ PHANTOM_LEFT = 0,
+ PHANTOM_RIGHT = 1,
+ PHANTOM_TOP = 2,
+ PHANTOM_BOTTOM = 3,
+ PHANTOM_COUNT = 4
+ };
+
+ protected:
+
+ void init_phantom_points (hb_codepoint_t gid, hb_array_t<contour_point_t> &phantoms /* IN/OUT */) const
+ {
+ const Glyph &glyph = glyph_for_gid (gid);
+ int h_delta = (int) glyph.get_header ().xMin - face->table.hmtx->get_side_bearing (gid);
+ int v_orig = (int) glyph.get_header ().yMax + face->table.vmtx->get_side_bearing (gid);
+ unsigned int h_adv = face->table.hmtx->get_advance (gid);
+ unsigned int v_adv = face->table.vmtx->get_advance (gid);
+
+ phantoms[PHANTOM_LEFT].x = h_delta;
+ phantoms[PHANTOM_RIGHT].x = h_adv + h_delta;
+ phantoms[PHANTOM_TOP].y = v_orig;
+ phantoms[PHANTOM_BOTTOM].y = v_orig - (int) v_adv;
+ }
+
+ struct contour_bounds_t
+ {
+ contour_bounds_t () { min.x = min.y = FLT_MAX; max.x = max.y = -FLT_MAX; }
+
+ void add (const contour_point_t &p)
{
- *length = 0;
- // only 0 byte glyphs are healthy when missing GlyphHeader
- return glyph.length == 0;
+ min.x = hb_min (min.x, p.x);
+ min.y = hb_min (min.y, p.y);
+ max.x = hb_max (max.x, p.x);
+ max.y = hb_max (max.y, p.y);
}
- if (glyph_header.is_composite_glyph ())
+
+ bool empty () const { return (min.x >= max.x) || (min.y >= max.y); }
+
+ contour_point_t min;
+ contour_point_t max;
+ };
+
+#ifndef HB_NO_VAR
+ /* Note: Recursively calls itself.
+ * all_points includes phantom points
+ */
+ bool get_points_var (hb_codepoint_t gid,
+ const int *coords, unsigned int coord_count,
+ contour_point_vector_t &all_points /* OUT */,
+ unsigned int depth = 0) const
+ {
+ if (unlikely (depth++ > HB_MAX_NESTING_LEVEL)) return false;
+ contour_point_vector_t points;
+ hb_vector_t<unsigned int> end_points;
+ const Glyph &glyph = glyph_for_gid (gid);
+ if (unlikely (!glyph.get_contour_points (points, end_points))) return false;
+ hb_array_t<contour_point_t> phantoms = points.sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
+ init_phantom_points (gid, phantoms);
+ if (unlikely (!face->table.gvar->apply_deltas_to_points (gid, coords, coord_count, points.as_array (), end_points.as_array ()))) return false;
+
+ unsigned int comp_index = 0;
+ if (glyph.is_simple_glyph ())
+ all_points.extend (points.as_array ());
+ else if (glyph.is_composite_glyph ())
{
- unsigned int start = glyph.length;
- unsigned int end = glyph.length;
- unsigned int glyph_offset = &glyph - glyf_table;
- CompositeGlyphHeader::Iterator composite_it;
- if (unlikely (!CompositeGlyphHeader::get_iterator (&glyph, glyph.length,
- &composite_it)))
- return false;
- const CompositeGlyphHeader *last;
- do
+ for (auto &item : glyph.get_composite_iterator ())
{
- last = composite_it.current;
- } while (composite_it.move_to_next ());
+ contour_point_vector_t comp_points;
+ if (unlikely (!get_points_var (item.glyphIndex, coords, coord_count,
+ comp_points, depth))
+ || comp_points.length < PHANTOM_COUNT)
+ return false;
- if ((uint16_t) last->flags & CompositeGlyphHeader::WE_HAVE_INSTRUCTIONS)
- start = ((char *) last - (char *) glyf_table->dataZ.arrayZ)
- + last->get_size () - glyph_offset;
- if (unlikely (start > end))
- {
- DEBUG_MSG (SUBSET, nullptr, "Invalid instruction offset, %d is outside "
- "%d byte buffer", start, glyph.length);
- return false;
+ /* Copy phantom points from component if USE_MY_METRICS flag set */
+ if (item.is_use_my_metrics ())
+ for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
+ phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i];
+
+ /* Apply component transformation & translation */
+ item.transform_points (comp_points);
+
+ /* Apply translatation from gvar */
+ comp_points.translate (points[comp_index]);
+
+ if (item.is_anchored ())
+ {
+ unsigned int p1, p2;
+ item.get_anchor_points (p1, p2);
+ if (likely (p1 < all_points.length && p2 < comp_points.length))
+ {
+ contour_point_t delta;
+ delta.init (all_points[p1].x - comp_points[p2].x,
+ all_points[p1].y - comp_points[p2].y);
+
+ comp_points.translate (delta);
+ }
+ }
+
+ all_points.extend (comp_points.sub_array (0, comp_points.length - PHANTOM_COUNT));
+
+ comp_index++;
}
- *length = end - start;
+
+ all_points.extend (phantoms);
}
- else
+ else return false;
+
+ return true;
+ }
+
+ bool get_points_bearing_applied (hb_font_t *font, hb_codepoint_t gid, contour_point_vector_t &all_points) const
+ {
+ if (unlikely (!get_points_var (gid, font->coords, font->num_coords, all_points) ||
+ all_points.length < PHANTOM_COUNT)) return false;
+
+ /* Undocumented rasterizer behavior:
+ * Shift points horizontally by the updated left side bearing
+ */
+ contour_point_t delta;
+ delta.init (-all_points[all_points.length - PHANTOM_COUNT + PHANTOM_LEFT].x, 0.f);
+ if (delta.x) all_points.translate (delta);
+ return true;
+ }
+
+ protected:
+
+ bool get_var_extents_and_phantoms (hb_font_t *font, hb_codepoint_t gid,
+ hb_glyph_extents_t *extents=nullptr /* OUT */,
+ contour_point_vector_t *phantoms=nullptr /* OUT */) const
+ {
+ contour_point_vector_t all_points;
+ if (!unlikely (get_points_bearing_applied (font, gid, all_points))) return false;
+ if (extents)
{
- unsigned int instruction_len_offset = glyph_header.simple_instruction_len_offset ();
- if (unlikely (instruction_len_offset + 2 > glyph.length))
+ contour_bounds_t bounds;
+ for (unsigned int i = 0; i + PHANTOM_COUNT < all_points.length; i++)
+ bounds.add (all_points[i]);
+
+ if (bounds.min.x > bounds.max.x)
{
- DEBUG_MSG (SUBSET, nullptr, "Glyph size is too short, missing field "
- "instructionLength.");
- return false;
+ extents->width = 0;
+ extents->x_bearing = 0;
}
-
- const HBUINT16 &instruction_len = StructAtOffset<HBUINT16> (&glyph,
- instruction_len_offset);
- /* Out of bounds of the current glyph */
- if (unlikely (glyph_header.simple_length (instruction_len) > glyph.length))
+ else
+ {
+ extents->x_bearing = font->em_scalef_x (bounds.min.x);
+ extents->width = font->em_scalef_x (bounds.max.x - bounds.min.x);
+ }
+ if (bounds.min.y > bounds.max.y)
+ {
+ extents->height = 0;
+ extents->y_bearing = 0;
+ }
+ else
{
- DEBUG_MSG (SUBSET, nullptr, "The instructions array overruns the "
- "glyph's boundaries.");
- return false;
+ extents->y_bearing = font->em_scalef_y (bounds.max.y);
+ extents->height = font->em_scalef_y (bounds.min.y - bounds.max.y);
}
- *length = (uint16_t) instruction_len;
}
+ if (phantoms)
+ for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
+ (*phantoms)[i] = all_points[all_points.length - PHANTOM_COUNT + i];
return true;
}
- bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
+ bool get_var_metrics (hb_font_t *font, hb_codepoint_t gid,
+ contour_point_vector_t &phantoms) const
+ { return get_var_extents_and_phantoms (font, gid, nullptr, &phantoms); }
+
+ bool get_extents_var (hb_font_t *font, hb_codepoint_t gid,
+ hb_glyph_extents_t *extents) const
+ { return get_var_extents_and_phantoms (font, gid, extents); }
+#endif
+
+ public:
+#ifndef HB_NO_VAR
+ unsigned int get_advance_var (hb_font_t *font, hb_codepoint_t gid,
+ bool is_vertical) const
{
- unsigned int start_offset, end_offset;
- if (!get_offsets (glyph, &start_offset, &end_offset))
- return false;
+ bool success = false;
+ contour_point_vector_t phantoms;
+ phantoms.resize (PHANTOM_COUNT);
- hb_bytes_t ((const char *) glyf_table + start_offset,
- end_offset - start_offset).as<GlyphHeader> ()->get_extents (extents);
- return true;
+ if (likely (font->num_coords == face->table.gvar->get_axis_count ()))
+ success = get_var_metrics (font, gid, phantoms);
+
+ if (unlikely (!success))
+ return is_vertical ? face->table.vmtx->get_advance (gid) : face->table.hmtx->get_advance (gid);
+
+ if (is_vertical)
+ return roundf (phantoms[PHANTOM_TOP].y - phantoms[PHANTOM_BOTTOM].y);
+ else
+ return roundf (phantoms[PHANTOM_RIGHT].x - phantoms[PHANTOM_LEFT].x);
}
- hb_bytes_t bytes_for_glyph (const char *glyf, hb_codepoint_t gid)
+ int get_side_bearing_var (hb_font_t *font, hb_codepoint_t gid, bool is_vertical) const
+ {
+ hb_glyph_extents_t extents;
+ contour_point_vector_t phantoms;
+ phantoms.resize (PHANTOM_COUNT);
+
+ if (unlikely (!get_var_extents_and_phantoms (font, gid, &extents, &phantoms)))
+ return is_vertical ? face->table.vmtx->get_side_bearing (gid) : face->table.hmtx->get_side_bearing (gid);
+
+ return is_vertical ? ceil (phantoms[PHANTOM_TOP].y) - extents.y_bearing : floor (phantoms[PHANTOM_LEFT].x);
+ }
+#endif
+
+ bool get_extents (hb_font_t *font, hb_codepoint_t gid, hb_glyph_extents_t *extents) const
+ {
+#ifndef HB_NO_VAR
+ unsigned int coord_count;
+ const int *coords = hb_font_get_var_coords_normalized (font, &coord_count);
+ if (coords && coord_count > 0 && coord_count == face->table.gvar->get_axis_count ())
+ return get_extents_var (font, gid, extents);
+#endif
+
+ if (unlikely (gid >= num_glyphs)) return false;
+
+ return glyph_for_gid (gid).get_extents (font, gid, extents);
+ }
+
+ const Glyph
+ glyph_for_gid (hb_codepoint_t gid, bool needs_padding_removal = false) const
{
unsigned int start_offset, end_offset;
- if (unlikely (!(get_offsets (gid, &start_offset, &end_offset) &&
- remove_padding (start_offset, &end_offset))))
+ if (unlikely (gid >= num_glyphs)) return Glyph ();
+
+ if (short_offset)
{
- DEBUG_MSG (SUBSET, nullptr, "Unable to get offset or remove padding for %d", gid);
- return hb_bytes_t ();
+ const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataZ.arrayZ;
+ start_offset = 2 * offsets[gid];
+ end_offset = 2 * offsets[gid + 1];
}
- hb_bytes_t glyph_bytes = hb_bytes_t (glyf + start_offset, end_offset - start_offset);
- if (!glyph_bytes.as<GlyphHeader> ()->has_data ())
+ else
{
- DEBUG_MSG (SUBSET, nullptr, "Empty or invalid glyph size, %d", gid);
- return hb_bytes_t ();
+ const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataZ.arrayZ;
+ start_offset = offsets[gid];
+ end_offset = offsets[gid + 1];
}
- return glyph_bytes;
+
+ if (unlikely (start_offset > end_offset || end_offset > glyf_table.get_length ()))
+ return Glyph ();
+
+ Glyph glyph (hb_bytes_t ((const char *) this->glyf_table + start_offset,
+ end_offset - start_offset));
+ return needs_padding_removal ? glyph.trim_padding () : glyph;
+ }
+
+ void
+ add_gid_and_children (hb_codepoint_t gid, hb_set_t *gids_to_retain,
+ unsigned int depth = 0) const
+ {
+ if (unlikely (depth++ > HB_MAX_NESTING_LEVEL)) return;
+ /* Check if is already visited */
+ if (gids_to_retain->has (gid)) return;
+
+ gids_to_retain->add (gid);
+
+ for (auto &item : glyph_for_gid (gid).get_composite_iterator ())
+ add_gid_and_children (item.glyphIndex, gids_to_retain, depth);
}
private:
@@ -652,13 +1050,14 @@ struct glyf
unsigned int num_glyphs;
hb_blob_ptr_t<loca> loca_table;
hb_blob_ptr_t<glyf> glyf_table;
+ hb_face_t *face;
};
struct SubsetGlyph
{
hb_codepoint_t new_gid;
hb_codepoint_t old_gid;
- hb_bytes_t source_glyph;
+ Glyph source_glyph;
hb_bytes_t dest_start; /* region of source_glyph to copy first */
hb_bytes_t dest_end; /* region of source_glyph to copy second */
@@ -670,8 +1069,7 @@ struct glyf
hb_bytes_t dest_glyph = dest_start.copy (c);
dest_glyph = hb_bytes_t (&dest_glyph, dest_glyph.length + dest_end.copy (c).length);
unsigned int pad_length = padding ();
- DEBUG_MSG (SUBSET, nullptr, "serialize %d byte glyph, width %d pad %d",
- dest_glyph.length, dest_glyph.length + pad_length, pad_length);
+ DEBUG_MSG (SUBSET, nullptr, "serialize %d byte glyph, width %d pad %d", dest_glyph.length, dest_glyph.length + pad_length, pad_length);
HBUINT8 pad;
pad = 0;
@@ -681,56 +1079,27 @@ struct glyf
pad_length--;
}
- if (dest_glyph.length)
+ if (!unlikely (dest_glyph.length)) return_trace (true);
+
+ /* update components gids */
+ for (auto &_ : Glyph (dest_glyph).get_composite_iterator ())
{
- _fix_component_gids (plan, dest_glyph);
- if (plan->drop_hints)
- {
- _zero_instruction_length (dest_glyph);
- c->check_success (_remove_composite_instruction_flag (dest_glyph));
- }
+ hb_codepoint_t new_gid;
+ if (plan->new_gid_for_old_gid (_.glyphIndex, &new_gid))
+ ((OT::glyf::CompositeGlyphChain *) &_)->glyphIndex = new_gid;
}
+ if (plan->drop_hints) Glyph (dest_glyph).drop_hints ();
+
return_trace (true);
}
- void drop_hints (const OT::glyf::accelerator_t& glyf)
- {
- if (source_glyph.length == 0) return;
-
- unsigned int instruction_len = 0;
- if (!glyf.get_instruction_length (source_glyph, &instruction_len))
- {
- DEBUG_MSG (SUBSET, nullptr, "Unable to read instruction length for new_gid %d",
- new_gid);
- return ;
- }
-
- const GlyphHeader& header = *source_glyph.as<GlyphHeader> ();
- DEBUG_MSG (SUBSET, nullptr, "new_gid %d drop %d instruction bytes "
- "from %d byte source glyph",
- new_gid, instruction_len, source_glyph.length);
- if (header.is_composite_glyph ())
- {
- /* just chop instructions off the end for composite glyphs */
- dest_start = hb_bytes_t (&source_glyph, source_glyph.length - instruction_len);
- }
- else
- {
- unsigned int glyph_length = header.simple_length (instruction_len);
- dest_start = hb_bytes_t (&source_glyph, glyph_length - instruction_len);
- dest_end = hb_bytes_t (&source_glyph + glyph_length,
- source_glyph.length - glyph_length);
- DEBUG_MSG (SUBSET, nullptr, "source_len %d start len %d glyph_len %d "
- "instruction_len %d end len %d",
- source_glyph.length, dest_start.length, glyph_length,
- instruction_len, dest_end.length);
- }
- }
+ void drop_hints_bytes ()
+ { source_glyph.drop_hints_bytes (dest_start, dest_end); }
- unsigned int length () const { return dest_start.length + dest_end.length; }
+ unsigned int length () const { return dest_start.length + dest_end.length; }
/* pad to 2 to ensure 2-byte loca will be ok */
- unsigned int padding () const { return length () % 2; }
+ unsigned int padding () const { return length () % 2; }
unsigned int padded_size () const { return length () + padding (); }
};