X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Fimage.h;h=292de567230b8faea47ec1d5a4cc77a0050a5e89;hb=8d1746501682da3e2937c7e8670354f79b656934;hp=64d70a5751dcac609e96e87042d00a2021b9011c;hpb=a8bd6ecc4fe4016090fad92daf6d9a572941d035;p=ardour.git diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h index 64d70a5751..292de56723 100644 --- a/libs/canvas/canvas/image.h +++ b/libs/canvas/canvas/image.h @@ -36,7 +36,7 @@ class LIBCANVAS_API Image : public Item public: 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) @@ -65,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 @@ -97,7 +97,6 @@ private: Cairo::Format _format; int _width; int _height; - int _data; mutable boost::shared_ptr _current; boost::shared_ptr _pending; mutable bool _need_render;