From 1079b1b4c0331e5d4bd62f3c93349aec50f520f0 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 23 Jun 2011 18:38:51 +0200 Subject: Update 2Geom to pull in integer rectangle class (bzr r10347.1.1) --- src/eraser-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/eraser-context.cpp') diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index 8ac765b9e..de6c7d86f 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -62,7 +62,7 @@ #include "display/canvas-bpath.h" #include "display/canvas-arena.h" #include "livarot/Shape.h" -#include <2geom/isnan.h> +#include <2geom/math-utils.h> #include <2geom/pathvector.h> #include "eraser-context.h" -- cgit v1.2.3 From 72cc39b9f0b340548f395c7f61ca9662b34aea09 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 11:04:37 +0200 Subject: Refactor SPItem bounding box methods: remove NRRect usage and make code using them more obvious. Fix filter region computation. (bzr r10582.1.1) --- src/eraser-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/eraser-context.cpp') diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index de6c7d86f..11b150aa0 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -748,7 +748,7 @@ set_to_accumulated(SPEraserContext *dc) Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc(); SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(dc->repr)); - Geom::OptRect eraserBbox = acid->getBounds(Geom::identity()); + Geom::OptRect eraserBbox = acid->visualBounds(); Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt(); std::vector remainingItems; GSList* toWorkOn = 0; @@ -770,7 +770,7 @@ set_to_accumulated(SPEraserContext *dc) for (GSList *i = toWorkOn ; i ; i = i->next ) { SPItem *item = SP_ITEM(i->data); if ( eraserMode ) { - Geom::OptRect bbox = item->getBounds(Geom::identity()); + Geom::OptRect bbox = item->visualBounds(); if (bbox && bbox->intersects(*eraserBbox)) { Inkscape::XML::Node* dup = dc->repr->duplicate(xml_doc); dc->repr->parent()->appendChild(dup); -- cgit v1.2.3 From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 8 Dec 2011 11:53:54 +0000 Subject: Switch to top-level glib headers. Thanks to DimStar for patch Fixed bugs: - https://launchpad.net/bugs/898538 (bzr r10762) --- src/eraser-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/eraser-context.cpp') diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index 11b150aa0..2352d909f 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -38,7 +38,7 @@ #include "display/canvas-bpath.h" #include <2geom/bezier-utils.h> -#include +#include #include "macros.h" #include "document.h" #include "selection.h" -- cgit v1.2.3