[Gnash-commit] /srv/bzr/gnash/trunk r11368: Cairo Renderer frees the cairo surface, so stop double freeing it.

[John Wimer]

------------------------------------------------------------
revno: 11368
committer: John Wimer <address@hidden>
branch nick: trunk
timestamp: Wed 2009-08-05 18:19:21 +0200
message:
  Cairo Renderer frees the cairo surface, so stop double freeing it.
modified:
  gui/Kde4GlueCairo.cpp
  gui/fltk_glue_cairo.cpp
  gui/sdl_cairo_glue.cpp

=== modified file 'gui/Kde4GlueCairo.cpp'
--- a/gui/Kde4GlueCairo.cpp     2009-07-10 15:44:55 +0000
+++ b/gui/Kde4GlueCairo.cpp     2009-08-05 16:19:21 +0000
@@ -43,8 +43,6 @@
 {
     if (_cairo_surface)
         cairo_surface_destroy(_cairo_surface);
-    if (_cairo_handle)
-        cairo_destroy(_cairo_handle);
 }
 
 bool

=== modified file 'gui/fltk_glue_cairo.cpp'
--- a/gui/fltk_glue_cairo.cpp   2009-07-10 15:44:55 +0000
+++ b/gui/fltk_glue_cairo.cpp   2009-08-05 16:19:21 +0000
@@ -58,7 +58,6 @@
 FltkCairoGlue::~FltkCairoGlue()
 {
     cairo_surface_destroy(_cairo_surface);
-    cairo_destroy (_cairo_handle);
     delete [] _offscreenbuf;
 }
 

=== modified file 'gui/sdl_cairo_glue.cpp'
--- a/gui/sdl_cairo_glue.cpp    2009-07-10 15:44:55 +0000
+++ b/gui/sdl_cairo_glue.cpp    2009-08-05 16:19:21 +0000
@@ -34,7 +34,6 @@
 {
 //    GNASH_REPORT_FUNCTION;
     if ( _cairo_surface ) cairo_surface_destroy(_cairo_surface);
-    if ( _cairo_handle ) cairo_destroy (_cairo_handle);
     if ( _sdl_surface ) SDL_FreeSurface(_sdl_surface);
     if ( _screen ) SDL_FreeSurface(_screen);
     delete [] _render_image;