[Synfig-devl] Carlos Lopez : generic_pen: move data to generic_pen_base class

[root]

Author: Carlos Lopez <genet...@gmail.com>
Date:   Thu Jun 14 20:20:08 2012 +0200

generic_pen: move data to generic_pen_base class

---

 ETL/ETL/_pen.h |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ETL/ETL/_pen.h b/ETL/ETL/_pen.h
index c7dc619..99458e5 100644
--- a/ETL/ETL/_pen.h
+++ b/ETL/ETL/_pen.h
@@ -120,10 +120,10 @@ protected:
        int x_,y_;
        int w_,h_;
        int pitch_;
+       char *data_;
 public:
-       generic_pen_base(){}
-       generic_pen_base(int w, int h): x_(0), y_(0), w_(w), h_(h) { }
-       generic_pen_base(int w, int h, int pitch): x_(0), y_(0), w_(w), h_(h), 
pitch_(pitch) { }
+       generic_pen_base(): data_(NULL){}
+       generic_pen_base(char* data, int w, int h, int pitch): data_(data), 
x_(0), y_(0), w_(w), h_(h), pitch_(pitch) { }
        
        struct difference_type
        {
@@ -153,7 +153,6 @@ public:
 
 private:
        value_type value_;
-       char *data_;
 
        typedef generic_pen<T,AT> self_type;
 
@@ -169,22 +168,12 @@ private:
 
 public:
 
-       generic_pen(char *data, int w, int h, int pitch): generic_pen_base(w, 
h, pitch),
-               data_(data)
-       {
-       }
-
-       generic_pen(pointer data, int w, int h, int pitch): generic_pen_base(w, 
h, pitch),
-       data_((char*)(data))
-       {
-       }
+       generic_pen(char *data, int w, int h, int pitch): 
generic_pen_base(data, w, h, pitch) { }
+       generic_pen(pointer data, int w, int h, int pitch): 
generic_pen_base((char*)data, w, h, pitch) { }
        
-       generic_pen(char *data, int w, int h): 
generic_pen_base(w,h,sizeof(value_type)*w),
-               data_(data)
-       {
-       }
+       generic_pen(char *data, int w, int h): generic_pen_base(data, 
w,h,sizeof(value_type)*w) { }
 
-       generic_pen():data_(NULL) { }
+       generic_pen(): generic_pen_base() { }
 
        self_type& move(int a, int b)
        {


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl