Revert "cairo image crash debugging" and "initialize image data"

This reverts commit dfdb91b429e4f40e1883669bec58b9674ab8d2c2
and commit 188d766757d6029577e3409ee13efe9aa6f60173.

despite earlier assumptions the code is correct and there is
likely a memory corruption elsewhere.

diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index 3ea2aaae48a6c3c4cd619cde7358fb68ad48d732..0dcf8e51b33f4ef01133d8a2bbd265e84d7386a5 100644 (file)
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -47,7 +47,6 @@ public:
        {}
 
        virtual ~Data () {
-               std::cerr << "Data @ " << this << " being deleted, data ptr = " << data << " cb = " << destroy_callback << std::endl;
                if (destroy_callback) {
                        destroy_callback(data, destroy_arg);
                } else {

diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc
index 9deb184f2c67ca5b7e9b0bb1beed8e8c874808c7..b13859aeda270882ab4adfc17e6eee9b2e0f4d94 100644 (file)
--- a/libs/canvas/image.cc
+++ b/libs/canvas/image.cc
@@ -29,8 +29,6 @@ Image::Image (Group* group, Cairo::Format fmt, int width, int height)
        , _height (height)
        , _need_render (false)
 {
-       boost::shared_ptr<Data> d0 (new Data (NULL, 0, 0, 0, _format)); _current = d0;
-       boost::shared_ptr<Data> d1 (new Data (NULL, 0, 0, 0, _format)); _pending = d1;
        DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
 }