diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-02 17:59:13 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-02 17:59:13 +0000 |
| commit | ac167afb76ab4c730ac9dc945dc5dcd8efb8f5cf (patch) | |
| tree | 0dc4f7c1cc2391d96abc6005a854df6336c084f8 /src | |
| parent | Experimental merge of Ponyscape to Inkscape trunk (does not compile) (diff) | |
| download | inkscape-ac167afb76ab4c730ac9dc945dc5dcd8efb8f5cf.tar.gz inkscape-ac167afb76ab4c730ac9dc945dc5dcd8efb8f5cf.zip | |
Experimental Ponyscape to Inkscape merge (does not compile)
(bzr r13090.1.4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/cairo-utils.cpp | 4 | ||||
| -rw-r--r-- | src/display/cairo-utils.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/Makefile_insert | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index 5b358ade7..c0a17bcdd 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -30,8 +30,6 @@ #include "helper/geom-curves.h" #include "display/cairo-templates.h" -static void ink_cairo_pixbuf_cleanup(guchar *, void *); - /** * Key for cairo_surface_t to keep track of current color interpolation value * Only the address of the structure is used, it is never initialized. See: @@ -1119,7 +1117,7 @@ GdkPixbuf *ink_pixbuf_create_from_cairo_surface(cairo_surface_t *s) * to gdk_pixbuf_new_from_data when creating a GdkPixbuf backed by * a Cairo surface. */ -static void ink_cairo_pixbuf_cleanup(guchar * /*pixels*/, void *data) +void ink_cairo_pixbuf_cleanup(guchar * /*pixels*/, void *data) { cairo_surface_t *surface = static_cast<cairo_surface_t*>(data); cairo_surface_destroy(surface); diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index 505e2ca77..fa0ee8853 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -21,6 +21,8 @@ #include "style.h" struct SPColor; +void ink_cairo_pixbuf_cleanup(guchar *, void *); +void convert_pixbuf_argb32_to_normal(GdkPixbuf *pb); namespace Inkscape { diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert index 710b95c2b..e388b27f5 100644 --- a/src/ui/widget/Makefile_insert +++ b/src/ui/widget/Makefile_insert @@ -81,5 +81,10 @@ ink_common_sources += \ ui/widget/unit-menu.cpp \ ui/widget/unit-menu.h \ ui/widget/unit-tracker.h \ - ui/widget/unit-tracker.cpp - + ui/widget/unit-tracker.cpp \ + ui/widget/clipmaskicon.cpp \ + ui/widget/clipmaskicon.h \ + ui/widget/highlight-picker.cpp \ + ui/widget/highlight-picker.h \ + ui/widget/layertypeicon.cpp \ + ui/widget/layertypeicon.h |