Merge to XFA: Kill CFX_Object.

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

 
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.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.
 //
@@ skipping 40 matching lines @@
 typedef AGG_INT64  int64;
 typedef AGG_INT64U int64u;
 typedef unsigned char cover_type;
 enum cover_scale_e {
     cover_shift = 8,
     cover_size  = 1 << cover_shift,
     cover_mask  = cover_size - 1,
     cover_none  = 0,
     cover_full  = cover_mask
 };
-template<class T> struct rect_base : public CFX_Object {
+template<class T> struct rect_base  {
     typedef rect_base<T> self_type;
     T x1;
     T y1;
     T x2;
     T y2;
     rect_base() {}
     rect_base(T x1_, T y1_, T x2_, T y2_) :
         x1(x1_), y1(y1_), x2(x2_), y2(y2_) {}
     const self_type& normalize()
     {
@@ skipping 178 matching lines @@
 inline unsigned get_orientation(unsigned c)
 {
     c &= ~path_flags_jr;
     return c & (path_flags_cw | path_flags_ccw);
 }
 inline unsigned set_orientation(unsigned c, unsigned o)
 {
     c &= ~path_flags_jr;
     return clear_orientation(c) | o;
 }
-struct point_type : public CFX_Object {
+struct point_type  {
     FX_FLOAT x, y;
     unsigned flag;
     point_type() {}
     point_type(FX_FLOAT x_, FX_FLOAT y_, unsigned flag_ = 0) : x(x_), y(y_), flag(flag_) {}
 };
 struct point_type_flag : public point_type {
     unsigned flag;
     point_type_flag()
     {
         flag = 0;
     }
     point_type_flag(FX_FLOAT x_, FX_FLOAT y_, unsigned flag_ = 0) : point_type(x_, y_), flag(flag_) {}
 };
-struct vertex_type : public CFX_Object {
+struct vertex_type  {
     FX_FLOAT   x, y;
     unsigned cmd;
     vertex_type() {}
     vertex_type(FX_FLOAT x_, FX_FLOAT y_, unsigned cmd_) :
         x(x_), y(y_), cmd(cmd_) {}
 };
 }
 #endif