Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...

[inkscape.git] / src / 2geom / ellipse.h

diff --git a/src/2geom/ellipse.h b/src/2geom/ellipse.h
index a10f9ced090bdb5c2a97d9e5329c44948fd9a3c1..8e44f339593b04ea844fc27dc943ac1b9e1ee6bf 100644 (file)
--- a/src/2geom/ellipse.h
+++ b/src/2geom/ellipse.h
@@ -1,5 +1,6 @@
-/*
- * Ellipse Curve
+/**
+ * \file
+ * \brief  Ellipse Curve
  *
  * Authors:
  *      Marco Cecchetti <mrcekets at gmail.com>
@@ -37,12 +38,13 @@
 
 #include <2geom/point.h>
 #include <2geom/exception.h>
-
+#include <2geom/matrix.h>
 
 namespace Geom
 {
 
 class SVGEllipticalArc;
+class Circle;
 
 class Ellipse
 {
@@ -66,6 +68,8 @@ class Ellipse
     {
         set(points);
     }
+    
+    Ellipse(Geom::Circle const &c);
 
     void set(double cx, double cy, double rx, double ry, double a)
     {
@@ -108,6 +112,10 @@ class Ellipse
         return m_angle;
     }
 
+    std::vector<double> implicit_form_coefficients() const;
+
+    Ellipse transformed(Matrix const& m) const;
+
   private:
     Point m_centre, m_ray;
     double m_angle;
@@ -130,4 +138,4 @@ class Ellipse
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :