ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
This reverts commit dfdb91b429
and commit 188d766757.

despite earlier assumptions the code is correct and there is
likely a memory corruption elsewhere.
This commit is contained in:
Robin Gareus 2013-04-20 23:36:13 +02:00
parent dfdb91b429
commit fee8de9787
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/canvas/canvas/image.h
View File

@ -47,7 +47,6 @@ public:
{} {}
virtual ~Data () { virtual ~Data () {
std::cerr << "Data @ " << this << " being deleted, data ptr = " << data << " cb = " << destroy_callback << std::endl;
if (destroy_callback) { if (destroy_callback) {
destroy_callback(data, destroy_arg); destroy_callback(data, destroy_arg);
} else { } else {

2
libs/canvas/image.cc
View File

@ -29,8 +29,6 @@ Image::Image (Group* group, Cairo::Format fmt, int width, int height)
, _height (height) , _height (height)
, _need_render (false) , _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()); DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
} }