From 64e50f15e4a4fb6ffcd2aa3774f1b0dde990e99f Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 6 Apr 2009 22:29:34 +0000
Subject: 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)
---
 src/2geom/sbasis-math.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/2geom/sbasis-math.cpp')

diff --git a/src/2geom/sbasis-math.cpp b/src/2geom/sbasis-math.cpp
index 7053388dc..f3a984c96 100644
--- a/src/2geom/sbasis-math.cpp
+++ b/src/2geom/sbasis-math.cpp
@@ -149,7 +149,7 @@ static Piecewise<SBasis> sqrt_internal(SBasis const &f,
         sqrtf.resize(order+1, Linear(0,0));
         sqrtf[0] = Linear(std::sqrt(f[0][0]), std::sqrt(f[0][1]));
         SBasis r = f - multiply(sqrtf, sqrtf); // remainder    
-        for(unsigned i = 1; int(i) <= order and i<r.size(); i++) {
+        for(unsigned i = 1; int(i) <= order && i<r.size(); i++) {
             Linear ci(r[i][0]/(2*sqrtf[0][0]), r[i][1]/(2*sqrtf[0][1]));
             SBasis cisi = shift(ci, i);
             r -= multiply(shift((sqrtf*2 + cisi), i), SBasis(ci));
-- 
cgit v1.2.3