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

fixed Charset format selection

This commit is contained in:
Michiharu Ariza 2018-11-16 17:29:03 -08:00
parent b6903bd6c4
commit a6da9b9415
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,15 +335,19 @@ struct CFF1CSOpSet_Flatten : CFF1CSOpSet<CFF1CSOpSet_Flatten, FlattenParam>
struct RangeList : hb_vector_t<code_pair> struct RangeList : hb_vector_t<code_pair>
{ {
/* replace the first glyph ID in the "glyph" field each range with a nLeft value */ /* replace the first glyph ID in the "glyph" field each range with a nLeft value */
inline void finalize (unsigned int last_glyph) inline bool finalize (unsigned int last_glyph)
{ {
bool two_byte = false;
for (unsigned int i = (*this).len; i > 0; i--) for (unsigned int i = (*this).len; i > 0; i--)
{ {
code_pair &pair = (*this)[i - 1]; code_pair &pair = (*this)[i - 1];
unsigned int nLeft = last_glyph - pair.glyph - 1; unsigned int nLeft = last_glyph - pair.glyph - 1;
if (nLeft >= 0x100)
two_byte = true;
last_glyph = pair.glyph; last_glyph = pair.glyph;
pair.glyph = nLeft; pair.glyph = nLeft;
} }
return two_byte;
} }
}; };
@ -529,7 +533,6 @@ struct cff_subset_plan {
{ {
unsigned int size0, size_ranges; unsigned int size0, size_ranges;
hb_codepoint_t sid, last_sid = CFF_UNDEF_CODE; hb_codepoint_t sid, last_sid = CFF_UNDEF_CODE;
bool two_byte = false;
subset_charset_ranges.resize (0); subset_charset_ranges.resize (0);
unsigned int glyph; unsigned int glyph;
@ -549,7 +552,7 @@ struct cff_subset_plan {
last_sid = sid; last_sid = sid;
} }
subset_charset_ranges.finalize (glyph); bool two_byte = subset_charset_ranges.finalize (glyph);
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)