[cbdt] minor, tweak spaces
This commit is contained in:
Ebrahim Byagowi
parent
eaa2402a79
commit
71a2018600
|
|
@ -94,7 +94,7 @@ struct SmallGlyphMetrics
|
|||
HBINT8 bearingY;
|
||||
HBUINT8 advance;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(5);
|
||||
DEFINE_SIZE_STATIC (5);
|
||||
};
|
||||
|
||||
struct BigGlyphMetrics : SmallGlyphMetrics
|
||||
|
|
@ -103,7 +103,7 @@ struct BigGlyphMetrics : SmallGlyphMetrics
|
|||
HBINT8 vertBearingY;
|
||||
HBUINT8 vertAdvance;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(8);
|
||||
DEFINE_SIZE_STATIC (8);
|
||||
};
|
||||
|
||||
struct SBitLineMetrics
|
||||
|
|
@ -127,7 +127,7 @@ struct SBitLineMetrics
|
|||
HBINT8 padding1;
|
||||
HBINT8 padding2;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(12);
|
||||
DEFINE_SIZE_STATIC (12);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ struct IndexSubtableHeader
|
|||
HBUINT16 imageFormat;
|
||||
HBUINT32 imageDataOffset;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(8);
|
||||
DEFINE_SIZE_STATIC (8);
|
||||
};
|
||||
|
||||
template <typename OffsetType>
|
||||
|
|
@ -179,8 +179,8 @@ struct IndexSubtableFormat1Or3
|
|||
TRACE_SERIALIZE (this);
|
||||
Offset<OffsetType> embedded_offset;
|
||||
embedded_offset = offset;
|
||||
*size += sizeof(OffsetType);
|
||||
auto* o = c->embed (embedded_offset);
|
||||
*size += sizeof (OffsetType);
|
||||
auto *o = c->embed (embedded_offset);
|
||||
return_trace ((bool) o);
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ struct IndexSubtableFormat1Or3
|
|||
UnsizedArrayOf<Offset<OffsetType>>
|
||||
offsetArrayZ;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(8, offsetArrayZ);
|
||||
DEFINE_SIZE_ARRAY (8, offsetArrayZ);
|
||||
};
|
||||
|
||||
struct IndexSubtableFormat1 : IndexSubtableFormat1Or3<HBUINT32> {};
|
||||
|
|
@ -200,14 +200,16 @@ struct IndexSubtable
|
|||
{
|
||||
TRACE_SANITIZE (this);
|
||||
if (!u.header.sanitize (c)) return_trace (false);
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: return_trace (u.format1.sanitize (c, glyph_count));
|
||||
case 3: return_trace (u.format3.sanitize (c, glyph_count));
|
||||
default:return_trace (true);
|
||||
}
|
||||
}
|
||||
|
||||
bool finish_subtable (hb_serialize_context_t *c,
|
||||
bool
|
||||
finish_subtable (hb_serialize_context_t *c,
|
||||
unsigned int cbdt_prime_len,
|
||||
unsigned int num_glyphs,
|
||||
unsigned int *size /* OUT (accumulated) */)
|
||||
|
|
@ -215,14 +217,15 @@ struct IndexSubtable
|
|||
TRACE_SERIALIZE (this);
|
||||
|
||||
unsigned int local_offset = cbdt_prime_len - u.header.imageDataOffset;
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: return_trace (u.format1.add_offset (c, local_offset, size));
|
||||
case 3: {
|
||||
if (!u.format3.add_offset (c, local_offset, size))
|
||||
return_trace (false);
|
||||
if (!(num_glyphs & 0x01)) // Pad to 32-bit alignment if needed.
|
||||
return_trace (u.format3.add_offset (c, 0, size));
|
||||
return_trace(true);
|
||||
return_trace (true);
|
||||
}
|
||||
// TODO: implement 2, 4, 5.
|
||||
case 2: case 4: // No-op.
|
||||
|
|
@ -231,7 +234,8 @@ struct IndexSubtable
|
|||
}
|
||||
}
|
||||
|
||||
bool fill_missing_glyphs (hb_serialize_context_t *c,
|
||||
bool
|
||||
fill_missing_glyphs (hb_serialize_context_t *c,
|
||||
unsigned int cbdt_prime_len,
|
||||
unsigned int num_missing,
|
||||
unsigned int *size /* OUT (accumulated) */,
|
||||
|
|
@ -240,7 +244,8 @@ struct IndexSubtable
|
|||
TRACE_SERIALIZE (this);
|
||||
|
||||
unsigned int local_offset = cbdt_prime_len - u.header.imageDataOffset;
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: {
|
||||
for (unsigned int i = 0; i < num_missing; i++)
|
||||
{
|
||||
|
|
@ -266,10 +271,9 @@ struct IndexSubtable
|
|||
}
|
||||
}
|
||||
|
||||
bool copy_glyph_at_idx (hb_serialize_context_t *c,
|
||||
unsigned int idx,
|
||||
const char *cbdt,
|
||||
unsigned int cbdt_length,
|
||||
bool
|
||||
copy_glyph_at_idx (hb_serialize_context_t *c, unsigned int idx,
|
||||
const char *cbdt, unsigned int cbdt_length,
|
||||
hb_vector_t<char> *cbdt_prime /* INOUT */,
|
||||
IndexSubtable *subtable_prime /* INOUT */,
|
||||
unsigned int *size /* OUT (accumulated) */) const
|
||||
|
|
@ -280,19 +284,20 @@ struct IndexSubtable
|
|||
if (unlikely (!get_image_data (idx, &offset, &length, &format))) return_trace (false);
|
||||
if (unlikely (offset > cbdt_length || cbdt_length - offset < length)) return_trace (false);
|
||||
|
||||
auto* header_prime = subtable_prime->get_header();
|
||||
auto *header_prime = subtable_prime->get_header ();
|
||||
unsigned int new_local_offset = cbdt_prime->length - (unsigned int) header_prime->imageDataOffset;
|
||||
if (unlikely (!_copy_data_to_cbdt (cbdt_prime, cbdt + offset, length))) return_trace (false);
|
||||
|
||||
return_trace (subtable_prime->add_offset (c, new_local_offset, size));
|
||||
}
|
||||
|
||||
bool add_offset (hb_serialize_context_t *c,
|
||||
unsigned int local_offset,
|
||||
bool
|
||||
add_offset (hb_serialize_context_t *c, unsigned int local_offset,
|
||||
unsigned int *size /* OUT (accumulated) */)
|
||||
{
|
||||
TRACE_SERIALIZE (this);
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: return_trace (u.format1.add_offset (c, local_offset, size));
|
||||
case 3: return_trace (u.format3.add_offset (c, local_offset, size));
|
||||
// TODO: Implement tables 2, 4, 5
|
||||
|
|
@ -304,30 +309,28 @@ struct IndexSubtable
|
|||
|
||||
bool get_extents (hb_glyph_extents_t *extents HB_UNUSED) const
|
||||
{
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 2: case 5: /* TODO */
|
||||
case 1: case 3: case 4: /* Variable-metrics formats do not have metrics here. */
|
||||
default:return (false);
|
||||
}
|
||||
}
|
||||
|
||||
bool get_image_data (unsigned int idx,
|
||||
unsigned int *offset,
|
||||
unsigned int *length,
|
||||
unsigned int *format) const
|
||||
bool
|
||||
get_image_data (unsigned int idx, unsigned int *offset,
|
||||
unsigned int *length, unsigned int *format) const
|
||||
{
|
||||
*format = u.header.imageFormat;
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: return u.format1.get_image_data (idx, offset, length);
|
||||
case 3: return u.format3.get_image_data (idx, offset, length);
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
const IndexSubtableHeader* get_header() const
|
||||
{
|
||||
return &u.header;
|
||||
}
|
||||
const IndexSubtableHeader* get_header () const { return &u.header; }
|
||||
|
||||
void populate_header (unsigned index_format,
|
||||
unsigned image_format,
|
||||
|
|
@ -337,7 +340,8 @@ struct IndexSubtable
|
|||
u.header.indexFormat = index_format;
|
||||
u.header.imageFormat = image_format;
|
||||
u.header.imageDataOffset = image_data_offset;
|
||||
switch (u.header.indexFormat) {
|
||||
switch (u.header.indexFormat)
|
||||
{
|
||||
case 1: *size += IndexSubtableFormat1::min_size; break;
|
||||
case 3: *size += IndexSubtableFormat3::min_size; break;
|
||||
}
|
||||
|
|
@ -378,12 +382,12 @@ struct IndexSubtableRecord
|
|||
{
|
||||
TRACE_SERIALIZE (this);
|
||||
|
||||
auto* subtable = c->serializer->start_embed<IndexSubtable> ();
|
||||
auto *subtable = c->serializer->start_embed<IndexSubtable> ();
|
||||
if (unlikely (!subtable)) return_trace (false);
|
||||
if (unlikely (!c->serializer->extend_min (subtable))) return_trace (false);
|
||||
|
||||
auto* old_subtable = get_subtable (base);
|
||||
auto* old_header = old_subtable->get_header ();
|
||||
auto *old_subtable = get_subtable (base);
|
||||
auto *old_header = old_subtable->get_header ();
|
||||
|
||||
subtable->populate_header (old_header->indexFormat,
|
||||
old_header->imageFormat,
|
||||
|
|
@ -397,8 +401,9 @@ struct IndexSubtableRecord
|
|||
hb_codepoint_t new_gid = (*lookup)[i].first;
|
||||
const IndexSubtableRecord *next_record = (*lookup)[i].second;
|
||||
const IndexSubtable *next_subtable = next_record->get_subtable (base);
|
||||
auto* next_header = next_subtable->get_header ();
|
||||
if (next_header != old_header) {
|
||||
auto *next_header = next_subtable->get_header ();
|
||||
if (next_header != old_header)
|
||||
{
|
||||
*start = i;
|
||||
early_exit = true;
|
||||
break;
|
||||
|
|
@ -471,7 +476,8 @@ struct IndexSubtableRecord
|
|||
return_trace (true);
|
||||
}
|
||||
|
||||
unsigned int add_glyph_for_subset (hb_codepoint_t gid) {
|
||||
unsigned int add_glyph_for_subset (hb_codepoint_t gid)
|
||||
{
|
||||
if (firstGlyphIndex > lastGlyphIndex)
|
||||
{
|
||||
firstGlyphIndex = gid;
|
||||
|
|
@ -486,11 +492,8 @@ struct IndexSubtableRecord
|
|||
return num_missing;
|
||||
}
|
||||
|
||||
bool get_extents (hb_glyph_extents_t *extents,
|
||||
const void *base) const
|
||||
{
|
||||
return (base+offsetToSubtable).get_extents (extents);
|
||||
}
|
||||
bool get_extents (hb_glyph_extents_t *extents, const void *base) const
|
||||
{ return (base+offsetToSubtable).get_extents (extents); }
|
||||
|
||||
bool get_image_data (unsigned int gid,
|
||||
const void *base,
|
||||
|
|
@ -507,7 +510,7 @@ struct IndexSubtableRecord
|
|||
HBGlyphID lastGlyphIndex;
|
||||
LOffsetTo<IndexSubtable> offsetToSubtable;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(8);
|
||||
DEFINE_SIZE_STATIC (8);
|
||||
};
|
||||
|
||||
struct IndexSubtableArray
|
||||
|
|
@ -520,9 +523,10 @@ struct IndexSubtableArray
|
|||
return_trace (indexSubtablesZ.sanitize (c, count, this));
|
||||
}
|
||||
|
||||
void build_lookup (hb_subset_context_t *c,
|
||||
cblc_bitmap_size_subset_context_t *bitmap_size_context,
|
||||
hb_vector_t<hb_pair_t<hb_codepoint_t, const IndexSubtableRecord*>> *lookup /* OUT */) const
|
||||
void
|
||||
build_lookup (hb_subset_context_t *c, cblc_bitmap_size_subset_context_t *bitmap_size_context,
|
||||
hb_vector_t<hb_pair_t<hb_codepoint_t,
|
||||
const IndexSubtableRecord*>> *lookup /* OUT */) const
|
||||
{
|
||||
bool start_glyph_is_set = false;
|
||||
for (hb_codepoint_t new_gid = 0; new_gid < c->plan->num_output_glyphs (); new_gid++)
|
||||
|
|
@ -530,7 +534,7 @@ struct IndexSubtableArray
|
|||
hb_codepoint_t old_gid;
|
||||
if (unlikely (!c->plan->old_gid_for_new_gid (new_gid, &old_gid))) continue;
|
||||
|
||||
const IndexSubtableRecord* record = find_table(old_gid, bitmap_size_context->num_tables);
|
||||
const IndexSubtableRecord* record = find_table (old_gid, bitmap_size_context->num_tables);
|
||||
if (unlikely (!record)) continue;
|
||||
|
||||
// Don't add gaps to the lookup. The best way to determine if a glyph is a
|
||||
|
|
@ -550,12 +554,13 @@ struct IndexSubtableArray
|
|||
}
|
||||
}
|
||||
|
||||
bool subset (hb_subset_context_t *c,
|
||||
bool
|
||||
subset (hb_subset_context_t *c,
|
||||
cblc_bitmap_size_subset_context_t *bitmap_size_context) const
|
||||
{
|
||||
TRACE_SUBSET (this);
|
||||
|
||||
auto* dst = c->serializer->start_embed<IndexSubtableArray> ();
|
||||
auto *dst = c->serializer->start_embed<IndexSubtableArray> ();
|
||||
if (unlikely (!dst)) return_trace (false);
|
||||
|
||||
hb_vector_t<hb_pair_t<hb_codepoint_t, const IndexSubtableRecord*>> lookup;
|
||||
|
|
@ -574,7 +579,7 @@ struct IndexSubtableArray
|
|||
// resolving links.
|
||||
hb_vector_t<hb_serialize_context_t::objidx_t> objidxs;
|
||||
for (unsigned int i = 0; i < records.length; i++)
|
||||
objidxs.push (c->serializer->pop_pack());
|
||||
objidxs.push (c->serializer->pop_pack ());
|
||||
for (unsigned int i = 0; i < records.length; i++)
|
||||
{
|
||||
IndexSubtableRecord* record = c->serializer->embed (records[i]);
|
||||
|
|
@ -615,23 +620,20 @@ struct BitmapSizeTable
|
|||
vertical.sanitize (c));
|
||||
}
|
||||
|
||||
const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
|
||||
const void *base,
|
||||
const void **out_base) const
|
||||
const IndexSubtableRecord *
|
||||
find_table (hb_codepoint_t glyph, const void *base, const void **out_base) const
|
||||
{
|
||||
*out_base = &(base+indexSubtableArrayOffset);
|
||||
return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables);
|
||||
}
|
||||
|
||||
bool subset(hb_subset_context_t *c,
|
||||
const void *src_base,
|
||||
const void *dst_base,
|
||||
const char *cbdt,
|
||||
unsigned int cbdt_length,
|
||||
bool
|
||||
subset (hb_subset_context_t *c, const void *src_base, const void *dst_base,
|
||||
const char *cbdt, unsigned int cbdt_length,
|
||||
hb_vector_t<char> *cbdt_prime /* INOUT */) const
|
||||
{
|
||||
TRACE_SUBSET (this);
|
||||
auto* out_table = c->serializer->embed (this);
|
||||
auto *out_table = c->serializer->embed (this);
|
||||
if (unlikely (!out_table)) return_trace (false);
|
||||
|
||||
cblc_bitmap_size_subset_context_t bitmap_size_context;
|
||||
|
|
@ -643,7 +645,7 @@ struct BitmapSizeTable
|
|||
bitmap_size_context.start_glyph = 1;
|
||||
bitmap_size_context.end_glyph = 0;
|
||||
|
||||
if (!out_table->indexSubtableArrayOffset.serialize_subset(c,
|
||||
if (!out_table->indexSubtableArrayOffset.serialize_subset (c,
|
||||
indexSubtableArrayOffset,
|
||||
src_base,
|
||||
dst_base,
|
||||
|
|
@ -676,7 +678,7 @@ struct BitmapSizeTable
|
|||
HBUINT8 bitDepth;
|
||||
HBINT8 flags;
|
||||
public:
|
||||
DEFINE_SIZE_STATIC(48);
|
||||
DEFINE_SIZE_STATIC (48);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -689,7 +691,7 @@ struct GlyphBitmapDataFormat17
|
|||
SmallGlyphMetrics glyphMetrics;
|
||||
LArrayOf<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(9, data);
|
||||
DEFINE_SIZE_ARRAY (9, data);
|
||||
};
|
||||
|
||||
struct GlyphBitmapDataFormat18
|
||||
|
|
@ -697,14 +699,14 @@ struct GlyphBitmapDataFormat18
|
|||
BigGlyphMetrics glyphMetrics;
|
||||
LArrayOf<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(12, data);
|
||||
DEFINE_SIZE_ARRAY (12, data);
|
||||
};
|
||||
|
||||
struct GlyphBitmapDataFormat19
|
||||
{
|
||||
LArrayOf<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(4, data);
|
||||
DEFINE_SIZE_ARRAY (4, data);
|
||||
};
|
||||
|
||||
struct CBLC
|
||||
|
|
@ -721,8 +723,8 @@ struct CBLC
|
|||
sizeTables.sanitize (c, this));
|
||||
}
|
||||
|
||||
static bool sink_cbdt(hb_subset_context_t *c,
|
||||
hb_vector_t<char>* cbdt_prime)
|
||||
static bool
|
||||
sink_cbdt (hb_subset_context_t *c, hb_vector_t<char>* cbdt_prime)
|
||||
{
|
||||
hb_blob_t *cbdt_prime_blob = hb_blob_create (cbdt_prime->arrayZ,
|
||||
cbdt_prime->length,
|
||||
|
|
@ -735,12 +737,10 @@ struct CBLC
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool subset_size_table (hb_subset_context_t *c,
|
||||
const BitmapSizeTable& table,
|
||||
const char *cbdt /* IN */,
|
||||
unsigned int cbdt_length,
|
||||
CBLC *cblc_prime /* INOUT */,
|
||||
hb_vector_t<char> *cbdt_prime /* INOUT */) const
|
||||
bool
|
||||
subset_size_table (hb_subset_context_t *c, const BitmapSizeTable& table,
|
||||
const char *cbdt /* IN */, unsigned int cbdt_length,
|
||||
CBLC *cblc_prime /* INOUT */, hb_vector_t<char> *cbdt_prime /* INOUT */) const
|
||||
{
|
||||
TRACE_SUBSET (this);
|
||||
cblc_prime->sizeTables.len++;
|
||||
|
|
@ -766,7 +766,7 @@ struct CBLC
|
|||
{
|
||||
unsigned count = sizeTables.len;
|
||||
if (unlikely (!count))
|
||||
return Null(BitmapSizeTable);
|
||||
return Null (BitmapSizeTable);
|
||||
|
||||
unsigned int requested_ppem = hb_max (font->x_ppem, font->y_ppem);
|
||||
if (!requested_ppem)
|
||||
|
|
@ -792,7 +792,7 @@ struct CBLC
|
|||
FixedVersion<> version;
|
||||
LArrayOf<BitmapSizeTable> sizeTables;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(8, sizeTables);
|
||||
DEFINE_SIZE_ARRAY (8, sizeTables);
|
||||
};
|
||||
|
||||
struct CBDT
|
||||
|
|
@ -803,8 +803,8 @@ struct CBDT
|
|||
{
|
||||
void init (hb_face_t *face)
|
||||
{
|
||||
cblc = hb_sanitize_context_t().reference_table<CBLC> (face);
|
||||
cbdt = hb_sanitize_context_t().reference_table<CBDT> (face);
|
||||
cblc = hb_sanitize_context_t ().reference_table<CBLC> (face);
|
||||
cbdt = hb_sanitize_context_t ().reference_table<CBDT> (face);
|
||||
|
||||
upem = hb_face_get_upem (face);
|
||||
}
|
||||
|
|
@ -815,8 +815,8 @@ struct CBDT
|
|||
this->cbdt.destroy ();
|
||||
}
|
||||
|
||||
bool get_extents (hb_font_t *font, hb_codepoint_t glyph,
|
||||
hb_glyph_extents_t *extents) const
|
||||
bool
|
||||
get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
|
||||
{
|
||||
const void *base;
|
||||
const BitmapSizeTable &strike = this->cblc->choose_strike (font);
|
||||
|
|
@ -831,7 +831,6 @@ struct CBDT
|
|||
if (!subtable_record->get_image_data (glyph, base, &image_offset, &image_length, &image_format))
|
||||
return false;
|
||||
|
||||
{
|
||||
unsigned int cbdt_len = cbdt.get_length ();
|
||||
if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
|
||||
return false;
|
||||
|
|
@ -841,23 +840,18 @@ struct CBDT
|
|||
case 17: {
|
||||
if (unlikely (image_length < GlyphBitmapDataFormat17::min_size))
|
||||
return false;
|
||||
const GlyphBitmapDataFormat17& glyphFormat17 =
|
||||
StructAtOffset<GlyphBitmapDataFormat17> (this->cbdt, image_offset);
|
||||
auto &glyphFormat17 = StructAtOffset<GlyphBitmapDataFormat17> (this->cbdt, image_offset);
|
||||
glyphFormat17.glyphMetrics.get_extents (font, extents);
|
||||
break;
|
||||
}
|
||||
case 18: {
|
||||
if (unlikely (image_length < GlyphBitmapDataFormat18::min_size))
|
||||
return false;
|
||||
const GlyphBitmapDataFormat18& glyphFormat18 =
|
||||
StructAtOffset<GlyphBitmapDataFormat18> (this->cbdt, image_offset);
|
||||
auto &glyphFormat18 = StructAtOffset<GlyphBitmapDataFormat18> (this->cbdt, image_offset);
|
||||
glyphFormat18.glyphMetrics.get_extents (font, extents);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
// TODO: Support other image formats.
|
||||
return false;
|
||||
}
|
||||
default: return false; /* TODO: Support other image formats. */
|
||||
}
|
||||
|
||||
/* Convert to font units. */
|
||||
|
|
@ -884,46 +878,43 @@ struct CBDT
|
|||
if (!subtable_record->get_image_data (glyph, base, &image_offset, &image_length, &image_format))
|
||||
return hb_blob_get_empty ();
|
||||
|
||||
{
|
||||
unsigned int cbdt_len = cbdt.get_length ();
|
||||
if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length))
|
||||
return hb_blob_get_empty ();
|
||||
|
||||
switch (image_format)
|
||||
{
|
||||
case 17: {
|
||||
case 17:
|
||||
{
|
||||
if (unlikely (image_length < GlyphBitmapDataFormat17::min_size))
|
||||
return hb_blob_get_empty ();
|
||||
const GlyphBitmapDataFormat17& glyphFormat17 =
|
||||
StructAtOffset<GlyphBitmapDataFormat17> (this->cbdt, image_offset);
|
||||
auto &glyphFormat17 = StructAtOffset<GlyphBitmapDataFormat17> (this->cbdt, image_offset);
|
||||
return hb_blob_create_sub_blob (cbdt.get_blob (),
|
||||
image_offset + GlyphBitmapDataFormat17::min_size,
|
||||
glyphFormat17.data.len);
|
||||
}
|
||||
case 18: {
|
||||
case 18:
|
||||
{
|
||||
if (unlikely (image_length < GlyphBitmapDataFormat18::min_size))
|
||||
return hb_blob_get_empty ();
|
||||
const GlyphBitmapDataFormat18& glyphFormat18 =
|
||||
StructAtOffset<GlyphBitmapDataFormat18> (this->cbdt, image_offset);
|
||||
auto &glyphFormat18 = StructAtOffset<GlyphBitmapDataFormat18> (this->cbdt, image_offset);
|
||||
return hb_blob_create_sub_blob (cbdt.get_blob (),
|
||||
image_offset + GlyphBitmapDataFormat18::min_size,
|
||||
glyphFormat18.data.len);
|
||||
}
|
||||
case 19: {
|
||||
case 19:
|
||||
{
|
||||
if (unlikely (image_length < GlyphBitmapDataFormat19::min_size))
|
||||
return hb_blob_get_empty ();
|
||||
const GlyphBitmapDataFormat19& glyphFormat19 =
|
||||
StructAtOffset<GlyphBitmapDataFormat19> (this->cbdt, image_offset);
|
||||
auto &glyphFormat19 = StructAtOffset<GlyphBitmapDataFormat19> (this->cbdt, image_offset);
|
||||
return hb_blob_create_sub_blob (cbdt.get_blob (),
|
||||
image_offset + GlyphBitmapDataFormat19::min_size,
|
||||
glyphFormat19.data.len);
|
||||
}
|
||||
default: return hb_blob_get_empty (); /* TODO: Support other image formats. */
|
||||
}
|
||||
}
|
||||
|
||||
return hb_blob_get_empty ();
|
||||
}
|
||||
|
||||
bool has_data () const { return cbdt.get_length (); }
|
||||
|
||||
private:
|
||||
|
|
@ -944,7 +935,7 @@ struct CBDT
|
|||
FixedVersion<> version;
|
||||
UnsizedArrayOf<HBUINT8> dataZ;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY(4, dataZ);
|
||||
DEFINE_SIZE_ARRAY (4, dataZ);
|
||||
};
|
||||
|
||||
inline bool
|
||||
|
|
@ -952,13 +943,13 @@ CBLC::subset (hb_subset_context_t *c) const
|
|||
{
|
||||
TRACE_SUBSET (this);
|
||||
|
||||
auto* cblc_prime = c->serializer->start_embed<CBLC> ();
|
||||
auto *cblc_prime = c->serializer->start_embed<CBLC> ();
|
||||
|
||||
// Use a vector as a secondary buffer as the tables need to be built in parallel.
|
||||
hb_vector_t<char> cbdt_prime;
|
||||
|
||||
if (unlikely (!cblc_prime)) return_trace (false);
|
||||
if (unlikely (!c->serializer->extend_min(cblc_prime))) return_trace (false);
|
||||
if (unlikely (!c->serializer->extend_min (cblc_prime))) return_trace (false);
|
||||
cblc_prime->version = version;
|
||||
|
||||
hb_blob_t* cbdt_blob = hb_sanitize_context_t ().reference_table<CBDT> (c->plan->source);
|
||||
|
|
|
|||
Loading…
Reference in New Issue