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

Make compiler happy with -Og

This commit is contained in:
Behdad Esfahbod 2019-05-08 12:01:55 -07:00
parent cdb61eb043
commit 750d5af48e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-cff-interp-cs-common.hh
View File

@ -160,7 +160,7 @@ struct cs_interp_env_t : interp_env_t<ARG>
void callSubr (const biased_subrs_t<SUBRS>& biasedSubrs, cs_type_t type) void callSubr (const biased_subrs_t<SUBRS>& biasedSubrs, cs_type_t type)
{ {
unsigned int subr_num; unsigned int subr_num = 0;
if (unlikely (!popSubrNum (biasedSubrs, subr_num) if (unlikely (!popSubrNum (biasedSubrs, subr_num)
|| callStack.get_count () >= kMaxCallLimit)) || callStack.get_count () >= kMaxCallLimit))

6
src/hb-ot-cmap-table.hh
View File

@ -142,7 +142,7 @@ struct CmapSubtableFormat4
for (unsigned int j = 0; j < num_codepoints; j++) for (unsigned int j = 0; j < num_codepoints; j++)
{ {
hb_codepoint_t cp = segments[i].start_code + j; hb_codepoint_t cp = segments[i].start_code + j;
hb_codepoint_t new_gid; hb_codepoint_t new_gid = 0;
if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid))) if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid)))
return_trace (false); return_trace (false);
glyph_id_array[j] = new_gid; glyph_id_array[j] = new_gid;
@ -183,7 +183,7 @@ struct CmapSubtableFormat4
hb_codepoint_t cp = HB_SET_VALUE_INVALID; hb_codepoint_t cp = HB_SET_VALUE_INVALID;
while (plan->unicodes->next (&cp)) { while (plan->unicodes->next (&cp)) {
hb_codepoint_t new_gid; hb_codepoint_t new_gid = 0;
if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid))) if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid)))
{ {
DEBUG_MSG(SUBSET, nullptr, "Unable to find new gid for %04x", cp); DEBUG_MSG(SUBSET, nullptr, "Unable to find new gid for %04x", cp);
@ -542,7 +542,7 @@ struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12>
hb_codepoint_t cp = HB_SET_VALUE_INVALID; hb_codepoint_t cp = HB_SET_VALUE_INVALID;
while (plan->unicodes->next (&cp)) { while (plan->unicodes->next (&cp)) {
hb_codepoint_t new_gid; hb_codepoint_t new_gid = 0;
if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid))) if (unlikely (!plan->new_gid_for_codepoint (cp, &new_gid)))
{ {
DEBUG_MSG(SUBSET, nullptr, "Unable to find new gid for %04x", cp); DEBUG_MSG(SUBSET, nullptr, "Unable to find new gid for %04x", cp);

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

@ -283,7 +283,7 @@ struct glyf
/* based on FontTools _g_l_y_f.py::trim */ /* based on FontTools _g_l_y_f.py::trim */
bool remove_padding (unsigned int start_offset, bool remove_padding (unsigned int start_offset,
unsigned int *end_offset) const unsigned int *end_offset) const
{ {
if (*end_offset - start_offset < GlyphHeader::static_size) return true; if (*end_offset - start_offset < GlyphHeader::static_size) return true;

4
src/hb-subset-glyf.cc
View File

@ -108,7 +108,7 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
hb_codepoint_t next_glyph = HB_SET_VALUE_INVALID; hb_codepoint_t next_glyph = HB_SET_VALUE_INVALID;
while (plan->glyphset ()->next (&next_glyph)) while (plan->glyphset ()->next (&next_glyph))
{ {
unsigned int start_offset, end_offset; unsigned int start_offset = 0, end_offset = 0;
if (unlikely (!(glyf.get_offsets (next_glyph, &start_offset, &end_offset) && if (unlikely (!(glyf.get_offsets (next_glyph, &start_offset, &end_offset) &&
glyf.remove_padding (start_offset, &end_offset)))) glyf.remove_padding (start_offset, &end_offset))))
{ {
@ -211,7 +211,7 @@ _write_glyf_and_loca_prime (const hb_subset_plan_t *plan,
} }
unsigned int start_offset, end_offset; unsigned int start_offset = 0, end_offset = 0;
if (unlikely (!(glyf.get_offsets (old_gid, &start_offset, &end_offset) && if (unlikely (!(glyf.get_offsets (old_gid, &start_offset, &end_offset) &&
glyf.remove_padding (start_offset, &end_offset)))) glyf.remove_padding (start_offset, &end_offset))))
end_offset = start_offset = 0; end_offset = start_offset = 0;