From fee8de97876f4f1162dc2047b80e2728c0c72044 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 20 Apr 2013 23:36:13 +0200 Subject: [PATCH] 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. --- libs/canvas/canvas/image.h | 1 - libs/canvas/image.cc | 2 -- 2 files changed, 3 deletions(-) diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h index 3ea2aaae48..0dcf8e51b3 100644 --- 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 9deb184f2c..b13859aeda 100644 --- 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 d0 (new Data (NULL, 0, 0, 0, _format)); _current = d0; - boost::shared_ptr d1 (new Data (NULL, 0, 0, 0, _format)); _pending = d1; DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context()); }