diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:22:53 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:22:53 +0000 |
| commit | ea791c4ddb154cf306d236feeb4805b46ec560ac (patch) | |
| tree | e199cd4ce1278486525d0421ecdd2c336eb28a9a | |
| parent | Purge sp_desktop_acetate (diff) | |
| download | inkscape-ea791c4ddb154cf306d236feeb4805b46ec560ac.tar.gz inkscape-ea791c4ddb154cf306d236feeb4805b46ec560ac.zip | |
Purge sp_desktop_drawing
(bzr r13813)
| -rw-r--r-- | src/desktop-handles.cpp | 8 | ||||
| -rw-r--r-- | src/desktop-handles.h | 1 | ||||
| -rw-r--r-- | src/ui/tools/calligraphic-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/dropper-tool.cpp | 4 |
4 files changed, 3 insertions, 12 deletions
diff --git a/src/desktop-handles.cpp b/src/desktop-handles.cpp index b0283537f..3a9bc757e 100644 --- a/src/desktop-handles.cpp +++ b/src/desktop-handles.cpp @@ -47,14 +47,6 @@ sp_desktop_guides (SPDesktop const * desktop) return desktop->guides; } -SPCanvasItem * -sp_desktop_drawing (SPDesktop const *desktop) -{ - g_return_val_if_fail (desktop != NULL, NULL); - - return desktop->drawing; -} - SPCanvasGroup * sp_desktop_sketch (SPDesktop const * desktop) { diff --git a/src/desktop-handles.h b/src/desktop-handles.h index 7c315020c..4f561bbd9 100644 --- a/src/desktop-handles.h +++ b/src/desktop-handles.h @@ -48,7 +48,6 @@ SPDocument * sp_desktop_document (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_main (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_gridgroup (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_guides (SPDesktop const * desktop); -SPCanvasItem *sp_desktop_drawing (SPDesktop const *desktop); SPCanvasGroup * sp_desktop_sketch (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_controls (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_tempgroup (SPDesktop const * desktop); diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp index 97ac3d112..821756a55 100644 --- a/src/ui/tools/calligraphic-tool.cpp +++ b/src/ui/tools/calligraphic-tool.cpp @@ -373,7 +373,7 @@ void CalligraphicTool::brush() { double R, G, B, A; Geom::IntRect area = Geom::IntRect::from_xywh(brush_w.floor(), Geom::IntPoint(1, 1)); cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1); - sp_canvas_arena_render_surface(SP_CANVAS_ARENA(sp_desktop_drawing(SP_EVENT_CONTEXT(this)->desktop)), s, area); + sp_canvas_arena_render_surface(SP_CANVAS_ARENA(this->desktop->getDrawing()), s, area); ink_cairo_surface_average_color_premul(s, R, G, B, A); cairo_surface_destroy(s); double max = MAX (MAX (R, G), B); diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index a1f0b482b..24dd7d0bf 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -230,7 +230,7 @@ bool DropperTool::root_handler(GdkEvent* event) { if (!r.hasZeroArea()) { Geom::IntRect area = r.roundOutwards(); cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, area.width(), area.height()); - sp_canvas_arena_render_surface(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), s, area); + sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area); ink_cairo_surface_average_color_premul(s, R, G, B, A); cairo_surface_destroy(s); } @@ -238,7 +238,7 @@ bool DropperTool::root_handler(GdkEvent* event) { // pick single pixel Geom::IntRect area = Geom::IntRect::from_xywh(floor(event->button.x), floor(event->button.y), 1, 1); cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1); - sp_canvas_arena_render_surface(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), s, area); + sp_canvas_arena_render_surface(SP_CANVAS_ARENA(desktop->getDrawing()), s, area); ink_cairo_surface_average_color_premul(s, R, G, B, A); cairo_surface_destroy(s); } |