Merge to XFA: Kill CFX_Object.

core/src/fxge/agg/agg23/agg_curves.h

 
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 // Copyright (C) 2005 Tony Juricic (tonygeek@yahoo.com)
 //
 // Permission to copy, use, modify, sell and distribute this software
 // is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
 //----------------------------------------------------------------------------
 // Contact: mcseem@antigrain.com
 //          mcseemagg@yahoo.com
 //          http://www.antigrain.com
 //----------------------------------------------------------------------------
 #ifndef AGG_CURVES_INCLUDED
 #define AGG_CURVES_INCLUDED
 #include "agg_array.h"
 namespace agg
 {
-struct curve4_points : public CFX_Object {
+struct curve4_points  {
     FX_FLOAT cp[8];
     curve4_points() {}
     curve4_points(FX_FLOAT x1, FX_FLOAT y1,
                   FX_FLOAT x2, FX_FLOAT y2,
                   FX_FLOAT x3, FX_FLOAT y3,
                   FX_FLOAT x4, FX_FLOAT y4)
     {
         cp[0] = x1;
         cp[1] = y1;
         cp[2] = x2;
@@ skipping 19 matching lines @@
     }
     FX_FLOAT  operator [] (unsigned i) const
     {
         return cp[i];
     }
     FX_FLOAT& operator [] (unsigned i)
     {
         return cp[i];
     }
 };
-class curve4_div : public CFX_Object
+class curve4_div 
 {
 public:
     curve4_div() :
         m_count(0)
     {}
     curve4_div(FX_FLOAT x1, FX_FLOAT y1,
                FX_FLOAT x2, FX_FLOAT y2,
                FX_FLOAT x3, FX_FLOAT y3,
                FX_FLOAT x4, FX_FLOAT y4) :
         m_count(0)
@@ skipping 55 matching lines @@
     void recursive_bezier(FX_FLOAT x1, FX_FLOAT y1,
                           FX_FLOAT x2, FX_FLOAT y2,
                           FX_FLOAT x3, FX_FLOAT y3,
                           FX_FLOAT x4, FX_FLOAT y4,
                           unsigned level);
     FX_FLOAT    m_distance_tolerance_square;
     FX_FLOAT    m_distance_tolerance_manhattan;
     unsigned              m_count;
     pod_deque<point_type> m_points;
 };
-class curve4 : public CFX_Object
+class curve4 
 {
 public:
     curve4() {}
     curve4(FX_FLOAT x1, FX_FLOAT y1,
            FX_FLOAT x2, FX_FLOAT y2,
            FX_FLOAT x3, FX_FLOAT y3,
            FX_FLOAT x4, FX_FLOAT y4)
     {
         init(x1, y1, x2, y2, x3, y3, x4, y4);
     }
@@ skipping 30 matching lines @@
     }
     int count()
     {
         return m_curve_div.count();
     }
 private:
     curve4_div m_curve_div;
 };
 }
 #endif