update to 2geom rev. 1168

(bzr r4068)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/2geom/path.cpp b/src/2geom/path.cpp
index 79dc0a5f4..98fec6e24 100644
--- a/src/2geom/path.cpp
+++ b/src/2geom/path.cpp
@@ -144,7 +144,7 @@ void Path::appendPortionTo(Path &ret, double from, double to) const {
 const double eps = .1;
 
 void Path::append(Curve const &curve) {
-  if ( curves_.front() != final_ && !near(curve.initialPoint(), (*final_)[0], eps) ) {
+  if ( curves_.front() != final_ && !are_near(curve.initialPoint(), (*final_)[0], eps) ) {
     throw ContinuityError();
   }
   do_append(curve.duplicate());
@@ -153,7 +153,7 @@ void Path::append(Curve const &curve) {
 void Path::append(D2<SBasis> const &curve) {
   if ( curves_.front() != final_ ) {
     for ( int i = 0 ; i < 2 ; ++i ) {
-      if ( !near(curve[i][0][0], (*final_)[0][i], eps) ) {
+      if ( !are_near(curve[i][0][0], (*final_)[0][i], eps) ) {
         throw ContinuityError();
       }
     }
@@ -205,17 +205,17 @@ void Path::check_continuity(Sequence::iterator first_replaced,
 {
   if ( first != last ) {
     if ( first_replaced != curves_.begin() ) {
-      if ( !near( (*first_replaced)->initialPoint(), (*first)->initialPoint(), eps ) ) {
+      if ( !are_near( (*first_replaced)->initialPoint(), (*first)->initialPoint(), eps ) ) {
         throw ContinuityError();
       }
     }
     if ( last_replaced != (curves_.end()-1) ) {
-      if ( !near( (*(last_replaced-1))->finalPoint(), (*(last-1))->finalPoint(), eps ) ) {
+      if ( !are_near( (*(last_replaced-1))->finalPoint(), (*(last-1))->finalPoint(), eps ) ) {
         throw ContinuityError();
       }
     }
   } else if ( first_replaced != last_replaced && first_replaced != curves_.begin() && last_replaced != curves_.end()-1) {
-    if ( !near((*first_replaced)->initialPoint(), (*(last_replaced-1))->finalPoint(), eps ) ) {
+    if ( !are_near((*first_replaced)->initialPoint(), (*(last_replaced-1))->finalPoint(), eps ) ) {
       throw ContinuityError();
     }
   }