From bd91c05befcd0db146a9f8ae604e6b7a2efdbe78 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 12 Nov 2007 19:47:07 +0000 Subject: update to 2geom rev. 1168 (bzr r4068) --- src/2geom/shape.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/2geom/shape.cpp') diff --git a/src/2geom/shape.cpp b/src/2geom/shape.cpp index 54218d4d9..3cf6d0bc0 100644 --- a/src/2geom/shape.cpp +++ b/src/2geom/shape.cpp @@ -296,7 +296,7 @@ unsigned pick_coincident(unsigned ix, unsigned jx, bool &rev, std::vector for(unsigned k = jx; k < crs[ix].size(); k++) { unsigned koix = crs[ix][k].getOther(ix); if(koix == oix) { - if(!near(otime, crs[ix][k].getTime(oix))) break; + if(!are_near(otime, crs[ix][k].getTime(oix))) break; for(unsigned dir = 0; dir < 2; dir++) { Point val = ps[ix].pointAt(fudgerize(crs[ix][k].getTime(ix), dir)) - cross_point; Cmp to_prev = cmp(cross(val, prev), 0); @@ -470,7 +470,7 @@ unsigned pick_coincident(unsigned ix, unsigned jx, bool pref, bool &rev, std::ve for(unsigned k = jx; k < crs[ix].size(); k++) { unsigned koix = crs[ix][k].getOther(ix); if(koix == oix) { - if(!near(otime, crs[ix][k].getTime(oix))) break; + if(!are_near(otime, crs[ix][k].getTime(oix))) break; for(unsigned dir = 0; dir < 2; dir++) { Point val = ps[ix].pointAt(crs[ix][k].getTime(ix) + (dir ? -0.01 : 0.01)) - cross_point; Cmp to_prev = cmp(cross(val, prev), 0); -- cgit v1.2.3