diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2009-04-06 22:29:34 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2009-04-06 22:29:34 +0000 |
| commit | 64e50f15e4a4fb6ffcd2aa3774f1b0dde990e99f (patch) | |
| tree | 0fae7298fc26ec9c39d73f1e9b33207c8bb0d9c2 /src/2geom/sbasis.cpp | |
| parent | noop: Rename argument from uri to filename for Extension::...::save implement... (diff) | |
| download | inkscape-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.cpp')
| -rw-r--r-- | src/2geom/sbasis.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/2geom/sbasis.cpp b/src/2geom/sbasis.cpp index 49678b19a..2f7f03bfc 100644 --- a/src/2geom/sbasis.cpp +++ b/src/2geom/sbasis.cpp @@ -375,7 +375,7 @@ SBasis sqrt(SBasis const &a, int k) { c[0] = Linear(std::sqrt(a[0][0]), std::sqrt(a[0][1])); SBasis r = a - multiply(c, c); // remainder - for(unsigned i = 1; i <= (unsigned)k and i<r.size(); i++) { + for(unsigned i = 1; i <= (unsigned)k && i<r.size(); i++) { Linear ci(r[i][0]/(2*c[0][0]), r[i][1]/(2*c[0][1])); SBasis cisi = shift(ci, i); r -= multiply(shift((c*2 + cisi), i), SBasis(ci)); |