removed unused multi_val from DictVal

This commit is contained in:
Michiharu Ariza 2018-10-23 15:11:09 -07:00
parent e1241636d6
commit 36c2c374bf
4 changed files with 1 additions and 21 deletions

View File

@ -596,22 +596,6 @@ struct ArgStack : Stack<ARG, 513>
return (unsigned)i; return (unsigned)i;
} }
inline void pop_delta (hb_vector_t<ARG>& vec, bool even=false)
{
if (even && unlikely ((this->count & 1) != 0))
{
S::set_error ();
return;
}
float val = 0.0f;
for (unsigned int i = 0; i < S::count; i++) {
val += S::elements[i].to_real ();
ARG *n = vec.push ();
n->set_real (val);
}
}
inline void push_longint_from_substr (SubByteStr& substr) inline void push_longint_from_substr (SubByteStr& substr)
{ {
push_int ((substr[0] << 24) | (substr[1] << 16) | (substr[2] << 8) | (substr[3])); push_int ((substr[0] << 24) | (substr[1] << 16) | (substr[2] << 8) | (substr[3]));

View File

@ -39,16 +39,13 @@ struct DictVal : OpStr
inline void init (void) inline void init (void)
{ {
single_val.set_int (0); single_val.set_int (0);
multi_val.init ();
} }
inline void fini (void) inline void fini (void)
{ {
multi_val.fini ();
} }
Number single_val; Number single_val;
hb_vector_t<Number> multi_val;
}; };
typedef DictVal NumDictVal; typedef DictVal NumDictVal;

View File

@ -857,7 +857,7 @@ struct CFF1PrivateDictOpSet : DictOpSet
case OpCode_FamilyOtherBlues: case OpCode_FamilyOtherBlues:
case OpCode_StemSnapH: case OpCode_StemSnapH:
case OpCode_StemSnapV: case OpCode_StemSnapV:
env.argStack.pop_delta (val.multi_val); env.clear_args ();
break; break;
case OpCode_StdHW: case OpCode_StdHW:
case OpCode_StdVW: case OpCode_StdVW:

View File

@ -338,7 +338,6 @@ struct CFF2PrivateDictOpSet : DictOpSet
case OpCode_FamilyOtherBlues: case OpCode_FamilyOtherBlues:
case OpCode_StemSnapH: case OpCode_StemSnapH:
case OpCode_StemSnapV: case OpCode_StemSnapV:
env.argStack.pop_delta (val.multi_val);
env.clear_args (); env.clear_args ();
break; break;
case OpCode_Subrs: case OpCode_Subrs: