summaryrefslogtreecommitdiffstats
path: root/src/2geom/sbasis-roots.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2009-04-06 22:29:34 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2009-04-06 22:29:34 +0000
commit64e50f15e4a4fb6ffcd2aa3774f1b0dde990e99f (patch)
tree0fae7298fc26ec9c39d73f1e9b33207c8bb0d9c2 /src/2geom/sbasis-roots.cpp
parentnoop: Rename argument from uri to filename for Extension::...::save implement... (diff)
downloadinkscape-64e50f15e4a4fb6ffcd2aa3774f1b0dde990e99f.tar.gz
inkscape-64e50f15e4a4fb6ffcd2aa3774f1b0dde990e99f.zip
update 2geom. big commit as it has been a while. (2geom svn rev. 1870, i think)
i turned some optional compilation stuff *on* per default, to help building inkscape. (bzr r7638)
Diffstat (limited to 'src/2geom/sbasis-roots.cpp')
-rw-r--r--src/2geom/sbasis-roots.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/2geom/sbasis-roots.cpp b/src/2geom/sbasis-roots.cpp
index 5249053fa..37e07cbe8 100644
--- a/src/2geom/sbasis-roots.cpp
+++ b/src/2geom/sbasis-roots.cpp
@@ -352,7 +352,7 @@ std::vector<double> roots1(SBasis const & s) {
double d = s[0][0] - s[0][1];
if(d != 0) {
double r = s[0][0] / d;
- if(0 <= r and r <= 1)
+ if(0 <= r && r <= 1)
res.push_back(r);
}
return res;