Rewrite NRArenaItem hierarchy into C++

(bzr r10347.1.21)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/2geom/affine.h b/src/2geom/affine.h
index d7a7a0692..22f8bd9f5 100644
--- a/src/2geom/affine.h
+++ b/src/2geom/affine.h
@@ -200,9 +200,8 @@ inline std::ostream &operator<< (std::ostream &out_file, const Geom::Affine &m)
     return out_file;
 }
 
-/** Given a matrix m such that unit_circle = m*x, this returns the
- * quadratic form x*A*x = 1.
- * @relates Affine */
+// Affine factories
+Affine from_basis(const Point x_basis, const Point y_basis, const Point offset=Point(0,0));
 Affine elliptic_quadratic_form(Affine const &m);
 
 /** Given a matrix (ignoring the translation) this returns the eigen
@@ -215,9 +214,6 @@ public:
     Eigen(double M[2][2]);
 };
 
-// Affine factories
-Affine from_basis(const Point x_basis, const Point y_basis, const Point offset=Point(0,0));
-
 /** @brief Create an identity matrix.
  * This is a convenience function identical to Affine::identity(). */
 inline Affine identity() {
@@ -239,6 +235,8 @@ inline Affine Affine::identity() {
     return ret; // allow NRVO
 }
 
+bool are_near(Affine const &a1, Affine const &a2, Coord eps=EPSILON);
+
 } // end namespace Geom
 
 #endif // LIB2GEOM_SEEN_AFFINE_H