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

silence & fix new warnings

This commit is contained in:
Michiharu Ariza 2018-10-02 14:13:36 -07:00
parent eed7e6bbc8
commit 35b64dfb57
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-cff-interp-dict-common.hh
View File

@ -210,7 +210,8 @@ struct DictOpSet : OpSet<Number>
case EXP_NEG: case EXP_NEG:
exp_neg = true; exp_neg = true;
/* NO BREAK */ HB_FALLTHROUGH;
case EXP_POS: case EXP_POS:
if (part == EXP_PART) return false; if (part == EXP_PART) return false;
part = EXP_PART; part = EXP_PART;

9
src/hb-cff1-interp-cs.hh
View File

@ -145,8 +145,9 @@ struct CFF1CSOpSet : CSOpSet<Number, OPSET, CFF1CSInterpEnv, PARAM, PATH>
} }
break; break;
case OpCode_random: case OpCode_random:
if (unlikely (!env.argStack.check_overflow (1))) return false; if (unlikely (!env.argStack.check_overflow (1))) return false;
env.argStack.push_int (1); /* we can't deal with random behavior; make it constant */ env.argStack.push_int (1); /* we can't deal with random behavior; make it constant */
break;
case OpCode_mul: case OpCode_mul:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false; if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_real (n1.to_real() * n2.to_real()); env.argStack.push_real (n1.to_real() * n2.to_real());
@ -170,7 +171,7 @@ struct CFF1CSOpSet : CSOpSet<Number, OPSET, CFF1CSInterpEnv, PARAM, PATH>
if (unlikely (!env.argStack.check_pop_num (n1))) return false; if (unlikely (!env.argStack.check_pop_num (n1))) return false;
int i = n1.to_int (); int i = n1.to_int ();
if (i < 0) i = 0; if (i < 0) i = 0;
if (unlikely (i >= env.argStack.get_count () || !env.argStack.check_overflow (1))) return false; if (unlikely ((unsigned int)i >= env.argStack.get_count () || !env.argStack.check_overflow (1))) return false;
env.argStack.push (env.argStack[env.argStack.get_count () - i - 1]); env.argStack.push (env.argStack[env.argStack.get_count () - i - 1]);
} }
break; break;
@ -179,7 +180,7 @@ struct CFF1CSOpSet : CSOpSet<Number, OPSET, CFF1CSInterpEnv, PARAM, PATH>
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false; if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
int n = n1.to_int (); int n = n1.to_int ();
int j = n2.to_int (); int j = n2.to_int ();
if (unlikely (n < 0 || n > env.argStack.get_count ())) return false; if (unlikely (n < 0 || (unsigned int)n > env.argStack.get_count ())) return false;
if (likely (n > 0)) if (likely (n > 0))
{ {
if (j < 0) if (j < 0)

4
src/hb-ot-cff-common.hh
View File

@ -138,7 +138,7 @@ struct CFFIndex
} }
} }
inline const unsigned int offset_at (unsigned int index) const inline unsigned int offset_at (unsigned int index) const
{ {
assert (index <= count); assert (index <= count);
const HBUINT8 *p = offsets + offSize * index; const HBUINT8 *p = offsets + offSize * index;
@ -149,7 +149,7 @@ struct CFFIndex
return offset; return offset;
} }
inline const unsigned int length_at (unsigned int index) const inline unsigned int length_at (unsigned int index) const
{ return offset_at (index + 1) - offset_at (index); } { return offset_at (index + 1) - offset_at (index); }
inline const char *data_base (void) const inline const char *data_base (void) const

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

@ -293,8 +293,8 @@ struct CFF1CSOpSet_Flatten : CFF1CSOpSet<CFF1CSOpSet_Flatten, FlattenParam>
env.clear_args (); env.clear_args ();
return; return;
} }
/* NO BREAK */ HB_FALLTHROUGH;
default: default:
SUPER::flush_args_and_op (op, env, param, start_arg); SUPER::flush_args_and_op (op, env, param, start_arg);
break; break;

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

@ -101,8 +101,8 @@ struct CFF2CSOpSet_Flatten : CFF2CSOpSet<CFF2CSOpSet_Flatten, FlattenParam>
env.clear_args (); env.clear_args ();
return; return;
} }
/* NO BREAK */ HB_FALLTHROUGH;
default: default:
SUPER::flush_args_and_op (op, env, param, start_arg); SUPER::flush_args_and_op (op, env, param, start_arg);
break; break;