X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Fimage.h;h=292de567230b8faea47ec1d5a4cc77a0050a5e89;hb=8d1746501682da3e2937c7e8670354f79b656934;hp=d54edd382776f86b16a423b7fd200aa83b1bbc5e;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index d54edd3827..292de56723 100644
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -34,8 +34,9 @@ namespace ArdourCanvas {
 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 (uint8_t *d, int w, int h, int s, Cairo::Format fmt)
 		: data (d)
@@ -64,12 +65,12 @@ public:
 	void* destroy_arg;
     };
 
-    /** 
-     * Returns a shared_ptr to a Data object that can be used to 
+    /**
+     * Returns a shared_ptr to a Data object that can be used to
      * write image data to. The Data object will contain a pointer
      * to the buffer, along with image properties that may be
      * useful during the data writing.
-     * 
+     *
      * Can be called from any thread BUT ..
      *
      * ... to avoid collisions with Image deletion, some synchronization method
@@ -96,7 +97,6 @@ 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;