Remove dead code.

[ardour.git] / libs / canvas / canvas / image.h

diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index a3b1a269ba50a5c00274f50f604d82396191663e..3e6f8209636cd776c4257655976ee6dfdc302f63 100644 (file)
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -23,29 +23,46 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 
+#include "canvas/visibility.h"
 #include "canvas/item.h"
 
+typedef void (*ImageReleaseCallback)(uint8_t *d, void *arg);
+
 namespace ArdourCanvas {
 
-class Image : public Item
+
+class LIBCANVAS_API Image : public Item
 {
 public:
-    Image (Group *, Cairo::Format, int width, int height);
+    Image (Canvas *, Cairo::Format, int width, int height);
+    Image (Item*, Cairo::Format, int width, int height);
     
     struct Data {
-       Data (boost::shared_array<uint8_t> d, int w, int h, int s, Cairo::Format fmt)
+       Data (uint8_t *d, int w, int h, int s, Cairo::Format fmt)
                : data (d)
                , width (w)
                , height (h)
                , stride (s)
                , format (fmt)
+               , destroy_callback(NULL)
+               , destroy_arg(NULL)
        {}
 
-       boost::shared_array<uint8_t> data;
+       virtual ~Data () {
+               if (destroy_callback) {
+                       destroy_callback(data, destroy_arg);
+               } else {
+                       free(data);
+               }
+       }
+
+       uint8_t* data;
        int width;
        int height;
        int stride;
        Cairo::Format format;
+       ImageReleaseCallback  destroy_callback;
+       void* destroy_arg;
     };
 
     /** 
@@ -59,7 +76,8 @@ public:
      * ... to avoid collisions with Image deletion, some synchronization method
      * may be required or the use of shared_ptr<Image> or similar.
      */
-    boost::shared_ptr<Data> get_image ();
+    boost::shared_ptr<Data> get_image (bool allocate_data = true);
+
 
     /**
      * Queues a Data object to be used to redraw this Image item
@@ -74,12 +92,11 @@ public:
 
     void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
     void compute_bounding_box () const;
-    
+
 private:
     Cairo::Format            _format;
     int                      _width;
     int                      _height;
-    int                      _data;
     mutable boost::shared_ptr<Data>  _current;
     boost::shared_ptr<Data>  _pending;
     mutable bool             _need_render;