diff options
| author | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
| commit | d24b3cc84d0701a5423925765e515db7df9614c5 (patch) | |
| tree | 0d63867d8b5a3c6ffe107371caa6b29cf8ad0f02 /src/func.cc | |
| parent | 633343c47e0d2bced64d47f62e814489b8e76dc2 (diff) | |
| parent | 1754a970a76c071fff91cc7c716aa0b78b4ac6be (diff) | |
Ported recent changes to master into the visitor branch
Diffstat (limited to 'src/func.cc')
| -rw-r--r-- | src/func.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/func.cc b/src/func.cc index 40512a4..fd4bd7e 100644 --- a/src/func.cc +++ b/src/func.cc @@ -1,6 +1,7 @@ /* - * OpenSCAD (www.openscad.at) - * Copyright (C) 2009 Clifford Wolf <clifford@clifford.at> + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,8 +29,8 @@ #include "context.h" #include "dxfdim.h" #include "builtin.h" -#include <math.h> #include <sstream> +#include "mathc99.h" AbstractFunction::~AbstractFunction() { @@ -290,7 +291,7 @@ Value builtin_log(const Context *, const QVector<QString>&, const QVector<Value> if (args.size() == 2 && args[0].type == Value::NUMBER && args[1].type == Value::NUMBER) return Value(log(args[1].num) / log(args[0].num)); if (args.size() == 1 && args[0].type == Value::NUMBER) - return Value(log(args[0].num) / log(10)); + return Value(log(args[0].num) / log(10.0)); return Value(); } |