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

fix build attempt ^4

This commit is contained in:
Michiharu Ariza 2018-08-15 15:00:32 -07:00
parent 270452a446
commit 7aa23f3597
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-cff-interp-cs.hh
View File

@ -116,11 +116,11 @@ struct CFFCSOpSet : CSOpSet<CFFSubrs, PARAM>
return true;
case OpCode_and:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_int ((n1.to_real() != 0.0f) && (n1.to_real() != 0.0f));
env.argStack.push_int ((n1.to_real() != 0.0f) && (n2.to_real() != 0.0f));
break;
case OpCode_or:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_int ((n1.to_real() != 0.0f) || (n1.to_real() != 0.0f));
env.argStack.push_int ((n1.to_real() != 0.0f) || (n2.to_real() != 0.0f));
break;
case OpCode_not:
if (unlikely (!env.argStack.check_pop_num (n1))) return false;
@ -132,11 +132,11 @@ struct CFFCSOpSet : CSOpSet<CFFSubrs, PARAM>
break;
case OpCode_add:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_real (n1.to_real() + n1.to_real());
env.argStack.push_real (n1.to_real() + n2.to_real());
break;
case OpCode_sub:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_real (n1.to_real() - n1.to_real());
env.argStack.push_real (n1.to_real() - n2.to_real());
break;
case OpCode_div:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
@ -151,7 +151,7 @@ struct CFFCSOpSet : CSOpSet<CFFSubrs, PARAM>
break;
case OpCode_eq:
if (unlikely (!env.argStack.check_pop_num2 (n1, n2))) return false;
env.argStack.push_int (n1.to_real() == n1.to_real());
env.argStack.push_int (n1.to_real() == n2.to_real());
break;
case OpCode_drop:
if (unlikely (!env.argStack.check_pop_num (n1))) return false;

2
src/hb-subset-cff.cc
View File

@ -209,7 +209,7 @@ struct CFFCSOpSet_SubrSubset : CFFCSOpSet<SubrRefMapPair>
default:
break;
}
return CFFCSOpSet::process_op (op, env, refMapPair);
return CFFCSOpSet<SubrRefMapPair>::process_op (op, env, refMapPair);
}
};