Improve the functions which create GdkPixbuf from Cairo surface

and vice versa. Simplifies some code.

Also introduce proper refcounting into svg_preview_cache.cpp
and fix its users.

(bzr r12512)

4 files changed, 77 insertions, 83 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 74e94b827..a09489f6d 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -33,7 +33,7 @@
 
 #include "ui/cache/svg_preview_cache.h"
 
-GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, const Geom::Rect& dbox, unsigned psize)
+GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, Geom::Rect const &dbox, unsigned psize)
 {
     Geom::Affine t(Geom::Scale(scale_factor, scale_factor));
     drawing.root()->setTransform(Geom::Scale(scale_factor));
@@ -61,13 +61,7 @@ GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, const
     drawing.render(ct, area, Inkscape::DrawingItem::RENDER_BYPASS_CACHE);
     cairo_surface_flush(s);
 
-    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(s),
-                                      GDK_COLORSPACE_RGB,
-                                      TRUE,
-                                      8, psize, psize, cairo_image_surface_get_stride(s),
-                                      ink_cairo_pixbuf_cleanup, s);
-    convert_pixbuf_argb32_to_normal(pixbuf);
-
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
     return pixbuf;
 }
 
@@ -81,6 +75,12 @@ SvgPreview::SvgPreview()
 
 SvgPreview::~SvgPreview()
 {
+    for (std::map<Glib::ustring, GdkPixbuf *>::iterator i = _pixmap_cache.begin();
+         i != _pixmap_cache.end(); ++i)
+    {
+        g_object_unref(i->second);
+        i->second = NULL;
+    }
 }
 
 Glib::ustring SvgPreview::cache_key(gchar const *uri, gchar const *name, unsigned psize) const {
@@ -102,6 +102,7 @@ GdkPixbuf* SvgPreview::get_preview_from_cache(const Glib::ustring& key) {
 }
 
 void SvgPreview::set_preview_in_cache(const Glib::ustring& key, GdkPixbuf* px) {
+    g_object_ref(px);
     _pixmap_cache[key] = px;
 }
 
@@ -123,6 +124,8 @@ GdkPixbuf* SvgPreview::get_preview(const gchar* uri, const gchar* id, Inkscape::
 void SvgPreview::remove_preview_from_cache(const Glib::ustring& key) {
     std::map<Glib::ustring, GdkPixbuf *>::iterator found = _pixmap_cache.find(key);
     if ( found != _pixmap_cache.end() ) {
+        g_object_unref(found->second);
+        found->second = NULL;
         _pixmap_cache.erase(key);
     }
 }
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 2292b66fc..7940c28ae 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -235,11 +235,7 @@ static void colorItemDragBegin( GtkWidget */*widget*/, GdkDragContext* dc, gpoin
                 cairo_pattern_destroy(gradient);
                 cairo_surface_flush(s);
 
-                pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(s),
-                                                  GDK_COLORSPACE_RGB, TRUE, 8,
-                                                  width, height, cairo_image_surface_get_stride(s),
-                                                  ink_cairo_pixbuf_cleanup, s);
-                convert_pixbuf_argb32_to_normal(pixbuf);
+                pixbuf = ink_pixbuf_create_from_cairo_surface(s);
             } else {
                 Glib::RefPtr<Gdk::Pixbuf> thumb = Gdk::Pixbuf::create( Gdk::COLORSPACE_RGB, false, 8, width, height );
                 guint32 fillWith = (0xff000000 & (item->def.getR() << 24))
@@ -561,11 +557,7 @@ void ColorItem::_regenPreview(EekPreview * preview)
         cairo_destroy(ct);
         cairo_surface_flush(s);
 
-        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
-                                                      GDK_COLORSPACE_RGB, TRUE, 8,
-                                                      w, h, cairo_image_surface_get_stride(s),
-                                                      ink_cairo_pixbuf_cleanup, s);
-        convert_pixbuf_argb32_to_normal(pixbuf);
+        GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
         eek_preview_set_pixbuf( preview, pixbuf );
     }
 
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 26bc52947..6427eb9cc 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -420,12 +420,12 @@ void SymbolsDialog::iconChanged() {
     // First look for default style stored in <symbol>
     gchar const* style = symbol->getAttribute("inkscape:symbol-style");
     if( !style ) {
-	  // If no default style in <symbol>, look in documents.
-	  if( symbolDocument == currentDocument ) {
-	    style = style_from_use( symbol_id.c_str(), currentDocument );
-	  } else {
-	    style = symbolDocument->getReprRoot()->attribute("style");
-	  }
+    // If no default style in <symbol>, look in documents.
+    if( symbolDocument == currentDocument ) {
+      style = style_from_use( symbol_id.c_str(), currentDocument );
+    } else {
+      style = symbolDocument->getReprRoot()->attribute("style");
+    }
     }
 
     ClipboardManager *cm = ClipboardManager::get();
@@ -489,8 +489,8 @@ SPDocument* read_vss( gchar* fullname, gchar* filename ) {
     while( std::getline( iss, line ) ) {
       // std::cout << line << std::endl;
       if( line.find( "svg:svg" ) == std::string::npos ) {
-	tmpSVGOutput += line;
-	tmpSVGOutput += "\n";
+  tmpSVGOutput += line;
+  tmpSVGOutput += "\n";
       }
     }
 
@@ -499,23 +499,23 @@ SPDocument* read_vss( gchar* fullname, gchar* filename ) {
 
   tmpSVGOutput += "  </defs>\n";
   tmpSVGOutput += "</svg>\n";
-	      
+        
   return SPDocument::createNewDocFromMem( tmpSVGOutput.c_str(), strlen( tmpSVGOutput.c_str()), 0 );
 
 }
 #endif
-											  
+                        
 /* Hunts preference directories for symbol files */
 void SymbolsDialog::get_symbols() {
 
   std::list<Glib::ustring> directories;
 
   if( Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_EXISTS ) &&
-	Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_IS_DIR ) ) {
+  Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_IS_DIR ) ) {
     directories.push_back( INKSCAPE_SYMBOLSDIR );
   }
   if( Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_EXISTS ) &&
-	Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
+  Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
     directories.push_back( profile_path("symbols") );
   }
 
@@ -526,46 +526,46 @@ void SymbolsDialog::get_symbols() {
     GDir *dir = g_dir_open( (*it).c_str(), 0, &err );
     if( dir ) {
 
-	gchar *filename = 0;
-	while( (filename = (gchar *)g_dir_read_name( dir ) ) != NULL) {
+  gchar *filename = 0;
+  while( (filename = (gchar *)g_dir_read_name( dir ) ) != NULL) {
 
-	  gchar *fullname = g_build_filename((*it).c_str(), filename, NULL);
+    gchar *fullname = g_build_filename((*it).c_str(), filename, NULL);
 
-	  if ( !Inkscape::IO::file_test( fullname, G_FILE_TEST_IS_DIR ) ) {
+    if ( !Inkscape::IO::file_test( fullname, G_FILE_TEST_IS_DIR ) ) {
 
-	    Glib::ustring fn( filename );
-	    Glib::ustring tag = fn.substr( fn.find_last_of(".") + 1 );
+      Glib::ustring fn( filename );
+      Glib::ustring tag = fn.substr( fn.find_last_of(".") + 1 );
 
-	    SPDocument* symbol_doc = NULL;
+      SPDocument* symbol_doc = NULL;
 
 #ifdef WITH_LIBVISIO
-	    if( tag.compare( "vss" ) == 0 ) {
-
-	      symbol_doc = read_vss( fullname, filename );
-	      if( symbol_doc ) {
-		symbolSets[Glib::ustring(filename)]= symbol_doc;
-		symbolSet->append(filename);
-	      }
-	    }
+      if( tag.compare( "vss" ) == 0 ) {
+
+        symbol_doc = read_vss( fullname, filename );
+        if( symbol_doc ) {
+    symbolSets[Glib::ustring(filename)]= symbol_doc;
+    symbolSet->append(filename);
+        }
+      }
 #endif
-	    // Try to read all remaining files as SVG
-	    if( !symbol_doc ) {
+      // Try to read all remaining files as SVG
+      if( !symbol_doc ) {
 
-	      symbol_doc = SPDocument::createNewDoc( fullname, FALSE );
-	      if( symbol_doc ) {
+        symbol_doc = SPDocument::createNewDoc( fullname, FALSE );
+        if( symbol_doc ) {
               gchar *title = symbol_doc->getRoot()->title();
               if( title == NULL ) {
                   title = _("Unnamed Symbols");
               }
-		      symbolSets[Glib::ustring(title)] = symbol_doc;
-		      symbolSet->append(title);
-	      }
-	    }
-
-	  }
-	  g_free( fullname );
-	}
-	g_dir_close( dir );
+          symbolSets[Glib::ustring(title)] = symbol_doc;
+          symbolSet->append(title);
+        }
+      }
+
+    }
+    g_free( fullname );
+  }
+  g_dir_close( dir );
     }
   }
 }
@@ -627,16 +627,16 @@ gchar const* SymbolsDialog::style_from_use( gchar const* id, SPDocument* documen
   for( ; l != NULL; l = l->next ) {
     SPObject* use = SP_OBJECT(l->data);
     if( SP_IS_USE( use ) ) {
-	gchar const *href = use->getRepr()->attribute("xlink:href");
-	if( href ) {
-	  Glib::ustring href2(href);
-	  Glib::ustring id2(id);
-	  id2 = "#" + id2;
-	  if( !href2.compare(id2) ) {
-	    style = use->getRepr()->attribute("style");
-	    break;
-	  }
-	}
+  gchar const *href = use->getRepr()->attribute("xlink:href");
+  if( href ) {
+    Glib::ustring href2(href);
+    Glib::ustring id2(id);
+    id2 = "#" + id2;
+    if( !href2.compare(id2) ) {
+      style = use->getRepr()->attribute("style");
+      break;
+    }
+  }
     }
   }
   return style;
@@ -749,9 +749,13 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, SPObject *symbol)
   /* Update to renderable state */
   Glib::ustring key = svg_preview_cache.cache_key(previewDocument->getURI(), symbol_id, psize);
   //std::cout << "  Key: " << key << std::endl;
-  // FIX ME
-  //Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::wrap(svg_preview_cache.get_preview_from_cache(key));
-  Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::RefPtr<Gdk::Pixbuf>(0);
+
+  Glib::RefPtr<Gdk::Pixbuf> pixbuf(NULL);
+  GdkPixbuf *pixbuf_gobj = svg_preview_cache.get_preview_from_cache(key);
+  if (pixbuf_gobj) {
+    g_object_ref(pixbuf_gobj); // the reference in svg_preview_cache will get destroyed when it's freed
+    pixbuf = Glib::wrap(pixbuf_gobj);
+  }
 
   // Find object's bbox in document.
   // Note symbols can have own viewport... ignore for now.
@@ -776,8 +780,8 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, SPObject *symbol)
     }
 
     if( fitSymbol->get_active() ) {
-	  /* Fit */
-	  scale = psize/std::max(width,height);
+    /* Fit */
+    scale = psize/std::max(width,height);
     }
 
     pixbuf = Glib::wrap(render_pixbuf(renderDrawing, scale, *dbox, psize));
@@ -814,8 +818,8 @@ void SymbolsDialog::setTargetDesktop(SPDesktop *desktop)
   if (this->currentDesktop != desktop) {
     this->currentDesktop = desktop;
     if( !symbolSets[symbolSet->get_active_text()] ) {
-	// Symbol set is from Current document, update
-	rebuild();
+  // Symbol set is from Current document, update
+  rebuild();
     }
   }
 }
diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp
index 4b4a7b738..5bcd16528 100644
--- a/src/ui/widget/color-preview.cpp
+++ b/src/ui/widget/color-preview.cpp
@@ -73,9 +73,9 @@ ColorPreview::on_expose_event (GdkEventExpose *event)
     if (get_is_drawable())
     {
         Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
-	cr->rectangle(event->area.x, event->area.y,
+    cr->rectangle(event->area.x, event->area.y,
                       event->area.width, event->area.height);
-	cr->clip();
+    cr->clip();
         result = on_draw(cr);
     }
 
@@ -176,12 +176,7 @@ ColorPreview::toPixbuf (int width, int height)
     cairo_destroy(ct);
     cairo_surface_flush(s);
 
-    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
-                                               GDK_COLORSPACE_RGB, TRUE, 8,
-                                               width, height, cairo_image_surface_get_stride(s),
-                                               ink_cairo_pixbuf_cleanup, s);
-    convert_pixbuf_argb32_to_normal(pixbuf);
-
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
     return pixbuf;
 }