Changeset 527 for abuse/trunk/src/imlib/timage.hTweet

Timestamp:

Apr 22, 2011, 4:13:04 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: some cleaning up in trans_image before I templatise half of it.

File:

• abuse/trunk/src/imlib/timage.h (modified) (2 diffs)

abuse/trunk/src/imlib/timage.h

@@ -25 +25 @@
 class trans_image       // transpernet image
 {
-  unsigned char *data;
-  short w,h;
+public:
+  trans_image(image *im, char const *name);  // name has no meaning if MEM_CHECK is off
 
-public :
-  short height() { return h; }
-  short width() { return w; }
-  trans_image(image *im, char const *name);  // name has no meaning if MEM_CHECK is off
+  inline vec2i Size() { return m_size; }
+  uint8_t *Data() { return m_data; }
+
   void put_image(image *screen, int x, int y);   // always transparent
 
@@ -54 +53 @@
   void put_predator(image *screen, int x, int y);
   void put_scan_line(image *screen, int x, int y, int line);   // always transparent
-  unsigned char *t_data() { return data; }
-  int size();
+  size_t MemUsage();
   image *make_image();
-  ~trans_image() { free(data); }
+  ~trans_image();
 
 private:
   uint8_t *ClipToLine(image *screen, int x1, int y1, int x2, int y2,
                       int x, int &y, int &ysteps);
-} ;
 
+  vec2i m_size;
+  uint8_t *m_data;
+};
 
 #endif
 
-
-
-
-