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

fixed bugs in Charset serialization 

also some code cleanup
This commit is contained in:
Michiharu Ariza 2018-09-12 13:22:19 -07:00
parent f45ac6296a
commit 1608481d88
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ot-cff1-table.hh
View File

@ -446,7 +446,7 @@ struct Charset {
dest->format.set (format); dest->format.set (format);
if (format == 0) if (format == 0)
{ {
Charset0 *fmt0 = c->allocate_size<Charset0> (Charset0::min_size + HBUINT8::static_size * (num_glyphs - 1)); Charset0 *fmt0 = c->allocate_size<Charset0> (Charset0::min_size + HBUINT16::static_size * (num_glyphs - 1));
if (unlikely (fmt0 == nullptr)) return_trace (false); if (unlikely (fmt0 == nullptr)) return_trace (false);
unsigned int glyph = 0; unsigned int glyph = 0;
for (unsigned int i = 0; i < sid_ranges.len; i++) for (unsigned int i = 0; i < sid_ranges.len; i++)
@ -488,7 +488,7 @@ struct Charset {
{ {
unsigned int size = min_size; unsigned int size = min_size;
if (format == 0) if (format == 0)
size += Charset0::min_size + HBUINT8::static_size * (count - 1); size += Charset0::min_size + HBUINT16::static_size * (count - 1);
else if (format == 1) else if (format == 1)
size += Charset1::min_size + Charset1_Range::static_size * count; size += Charset1::min_size + Charset1_Range::static_size * count;
else else

44
src/hb-subset-cff1.cc
View File

@ -321,6 +321,21 @@ struct CFF1CSOpSet_Flatten : CFF1CSOpSet<CFF1CSOpSet_Flatten, FlattenParam>
typedef CFF1CSOpSet<CFF1CSOpSet_Flatten, FlattenParam> SUPER; typedef CFF1CSOpSet<CFF1CSOpSet_Flatten, FlattenParam> SUPER;
}; };
struct RangeList : hb_vector_t<code_pair>
{
/* replace the first glyph ID in the "glyph" field each range with a nLeft value */
inline void finalize (unsigned int last_glyph)
{
for (unsigned int i = (*this).len; i > 0; i--)
{
code_pair &pair = (*this)[i - 1];
unsigned int nLeft = last_glyph - pair.glyph - 1;
last_glyph = pair.glyph;
pair.glyph = nLeft;
}
}
};
struct cff_subset_plan { struct cff_subset_plan {
inline cff_subset_plan (void) inline cff_subset_plan (void)
: final_size (0), : final_size (0),
@ -387,11 +402,6 @@ struct cff_subset_plan {
if (code != last_code + 1) if (code != last_code + 1)
{ {
if (subset_enc_code_ranges.len > 0)
{
code_pair &pair = subset_enc_code_ranges[subset_enc_code_ranges.len - 1];
pair.glyph = glyph - pair.glyph - 1;
}
code_pair pair = { code, glyph }; code_pair pair = { code, glyph };
subset_enc_code_ranges.push (pair); subset_enc_code_ranges.push (pair);
} }
@ -410,11 +420,8 @@ struct cff_subset_plan {
} }
} }
supp_codes.fini (); supp_codes.fini ();
if (subset_enc_code_ranges.len > 0)
{ subset_enc_code_ranges.finalize (glyph);
code_pair &pair = subset_enc_code_ranges[subset_enc_code_ranges.len - 1];
pair.glyph = glyph - pair.glyph - 1;
}
assert (subset_enc_num_codes <= 0xFF); assert (subset_enc_num_codes <= 0xFF);
size0 = Encoding0::min_size + HBUINT8::static_size * subset_enc_num_codes; size0 = Encoding0::min_size + HBUINT8::static_size * subset_enc_num_codes;
@ -449,24 +456,13 @@ struct cff_subset_plan {
if (sid != last_sid + 1) if (sid != last_sid + 1)
{ {
if (subset_charset_ranges.len > 0)
{
code_pair &pair = subset_charset_ranges[subset_charset_ranges.len - 1];
pair.glyph = glyph - pair.glyph - 1;
if ((pair.glyph & ~0xFF) != 0) two_byte = true;
}
code_pair pair = { sid, glyph }; code_pair pair = { sid, glyph };
subset_charset_ranges.push (pair); subset_charset_ranges.push (pair);
} }
last_sid = sid; last_sid = sid;
} }
if (subset_charset_ranges.len > 0) subset_charset_ranges.finalize (glyph);
{
code_pair &pair = subset_charset_ranges[subset_charset_ranges.len - 1];
pair.glyph = glyph - pair.glyph - 1;
if ((pair.glyph & ~0xFF) != 0) two_byte = true;
}
size0 = Charset0::min_size + HBUINT16::static_size * (plan->glyphs.len - 1); size0 = Charset0::min_size + HBUINT16::static_size * (plan->glyphs.len - 1);
if (!two_byte) if (!two_byte)
@ -706,11 +702,11 @@ struct cff_subset_plan {
bool subset_encoding; bool subset_encoding;
uint8_t subset_enc_format; uint8_t subset_enc_format;
unsigned int subset_enc_num_codes; unsigned int subset_enc_num_codes;
hb_vector_t<code_pair> subset_enc_code_ranges; RangeList subset_enc_code_ranges;
hb_vector_t<code_pair> subset_enc_supp_codes; hb_vector_t<code_pair> subset_enc_supp_codes;
uint8_t subset_charset_format; uint8_t subset_charset_format;
hb_vector_t<code_pair> subset_charset_ranges; RangeList subset_charset_ranges;
bool subset_charset; bool subset_charset;
RemapSID sidmap; RemapSID sidmap;