diff options
| author | Marius Kintel <marius@kintel.net> | 2011-04-12 15:51:45 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-04-12 15:51:45 (GMT) |
| commit | 1754a970a76c071fff91cc7c716aa0b78b4ac6be (patch) | |
| tree | 5faa0fad3b5324423cd44413d5fdd16c586c1e29 /src/func.cc | |
| parent | 592ca6abadcb6443629be4407b973279a891278c (diff) | |
| parent | a3cfe9e6d76f41cbd13711d1bc3843afe3d14f2d (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/func.cc')
| -rw-r--r-- | src/func.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/func.cc b/src/func.cc index e8ff54a..2608960 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,7 +29,8 @@ #include "context.h" #include "dxfdim.h" #include "builtin.h" -#include <math.h> +#include "mathc99.h" +#include <time.h> AbstractFunction::~AbstractFunction() { @@ -289,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(); } |