vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #760 from openscad/slow-min-max-fix 

Evaluate arguments only once in min/max builtins (fixes #738).
master
Marius Kintel 2014-04-15 16:42:53 -04:00
parent 296d2824d5 d2240efca8
commit f32a7bbb91
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/func.cc
View File

@ -196,9 +196,11 @@ Value builtin_min(const Context *, const EvalContext *evalctx)
{
if (evalctx->numArgs() >= 1 && evalctx->getArgValue(0).type() == Value::NUMBER) {
double val = evalctx->getArgValue(0).toDouble();
for (size_t i = 1; i < evalctx->numArgs(); i++)
if (evalctx->getArgValue(1).type() == Value::NUMBER)
val = fmin(val, evalctx->getArgValue(i).toDouble());
for (size_t i = 1; i < evalctx->numArgs(); i++) {
Value v = evalctx->getArgValue(i);
if (v.type() == Value::NUMBER)
val = fmin(val, v.toDouble());
}
return Value(val);
}
return Value();
@ -208,9 +210,11 @@ Value builtin_max(const Context *, const EvalContext *evalctx)
{
if (evalctx->numArgs() >= 1 && evalctx->getArgValue(0).type() == Value::NUMBER) {
double val = evalctx->getArgValue(0).toDouble();
for (size_t i = 1; i < evalctx->numArgs(); i++)
if (evalctx->getArgValue(1).type() == Value::NUMBER)
val = fmax(val, evalctx->getArgValue(i).toDouble());
for (size_t i = 1; i < evalctx->numArgs(); i++) {
Value v = evalctx->getArgValue(i);
if (v.type() == Value::NUMBER)
val = fmax(val, v.toDouble());
}
return Value(val);
}
return Value();