From 7df6616da5ea2debb86838366ddf746841549cdb Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 00:56:13 +0100 Subject: Renamed virtual function names. (bzr r11608.1.57) --- src/selection-chemistry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/selection-chemistry.cpp') diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index dd9e9df2d..2506c1477 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -2854,7 +2854,7 @@ static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups); } } else { - item->citem->onConvertToGuides(); + item->citem->convert_to_guides(); if (deleteitem) { item->deleteObject(true); -- cgit v1.2.3 From 8073924aacdda310fb7492750f78d5389b3186af Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 5 Apr 2013 22:45:01 +0200 Subject: Merged Item. (bzr r11608.1.81) --- src/selection-chemistry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/selection-chemistry.cpp') diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 2506c1477..1827ea7ff 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -2854,7 +2854,7 @@ static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups); } } else { - item->citem->convert_to_guides(); + item->convert_to_guides(); if (deleteitem) { item->deleteObject(true); -- cgit v1.2.3 From b0cc47554b385fb68643d07efe6e42366c7121ad Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 6 Apr 2013 01:36:16 +0200 Subject: Merged PaintServer and subclasses; moved Gradient classes to own files. (bzr r11608.1.82) --- src/selection-chemistry.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/selection-chemistry.cpp') diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 1827ea7ff..07a037557 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -69,10 +69,10 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; #include "document-undo.h" #include "sp-gradient.h" #include "sp-gradient-reference.h" -#include "sp-linear-gradient-fns.h" +#include "sp-linear-gradient.h" #include "sp-pattern.h" #include "sp-symbol.h" -#include "sp-radial-gradient-fns.h" +#include "sp-radial-gradient.h" #include "gradient-context.h" #include "sp-namedview.h" #include "preferences.h" -- cgit v1.2.3 From 083367b313247a4cf0c082fff25e993892dc38d1 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 19 Sep 2013 02:57:10 +0200 Subject: Encapsulate the shared memory hack for Cairo and GdkPixbuf in a class called Inkscape::Pixbuf. Replace usage in the code as appropriate. (bzr r12531) --- src/selection-chemistry.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/selection-chemistry.cpp') diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 868f5a35c..5ee21a738 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -96,6 +96,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; #include "uri-references.h" #include "display/curve.h" #include "display/canvas-bpath.h" +#include "display/cairo-utils.h" #include "inkscape-private.h" #include "path-chemistry.h" #include "ui/tool/control-point-selection.h" @@ -3480,9 +3481,10 @@ void sp_selection_create_bitmap_copy(SPDesktop *desktop) } // Import the image back - GdkPixbuf *pb = gdk_pixbuf_new_from_file(filepath, NULL); + Inkscape::Pixbuf *pb = Inkscape::Pixbuf::create_from_file(filepath); if (pb) { // Create the repr for the image + // TODO: avoid unnecessary roundtrip between data URI and decoded pixbuf Inkscape::XML::Node * repr = xml_doc->createElement("svg:image"); sp_embed_image(repr, pb); if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { // for default 90 dpi, snap it to pixel grid -- cgit v1.2.3