From 7185358d8867a5040b28fb81df369e6a99610d09 Mon Sep 17 00:00:00 2001 From: "Kim Maxim (fixer21k)" <> Date: Sun, 25 Jan 2015 11:40:42 +0100 Subject: Fix for bug #1130348 (Paint bucket filling multiple regions crashes when scrolling). Fixed bugs: - https://launchpad.net/bugs/1130348 (bzr r13873) --- src/ui/tools/flood-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/tools/flood-tool.cpp') diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index 82057f483..e4c4e855d 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -621,7 +621,7 @@ static ScanlineCheckResult perform_bitmap_scanline_check(std::deque bool currently_painting_top = false; bool currently_painting_bottom = false; - unsigned int top_ty = bci.y - 1; + unsigned int top_ty = (bci.y > 0) ? bci.y - 1 : 0; unsigned int bottom_ty = bci.y + 1; bool can_paint_top = (top_ty > 0); -- cgit v1.2.3 From 91ca2718bc979f20ec5e7e08f1a691edfb10752f Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sun, 8 Feb 2015 10:29:49 +0100 Subject: Commenting dead assignments. (bzr r13909) --- src/ui/tools/flood-tool.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/tools/flood-tool.cpp') diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index e4c4e855d..f9b64e4fd 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -1097,8 +1097,8 @@ bool FloodTool::item_handler(SPItem* item, GdkEvent* event) { desktop->applyCurrentOrToolStyle(item, "/tools/paintbucket", false); DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_PAINTBUCKET, _("Set style on object")); - - ret = TRUE; + // Dead assignment: Value stored to 'ret' is never read + //ret = TRUE; } break; -- cgit v1.2.3 From 73f83ba325e7d28693363d8d6e6b9482e4e12081 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Tue, 24 Feb 2015 20:04:28 -0500 Subject: Strip ToolFactory (bzr r13939.1.2) --- src/ui/tools/flood-tool.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/ui/tools/flood-tool.cpp') diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index f9b64e4fd..bb8782dfa 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -74,20 +74,10 @@ using Inkscape::Display::ExtractARGB32; using Inkscape::Display::ExtractRGB32; using Inkscape::Display::AssembleARGB32; -#include "ui/tool-factory.h" - namespace Inkscape { namespace UI { namespace Tools { -namespace { - ToolBase* createPaintbucketContext() { - return new FloodTool(); - } - - bool paintbucketContextRegistered = ToolFactory::instance().registerObject("/tools/paintbucket", createPaintbucketContext); -} - const std::string& FloodTool::getPrefsPath() { return FloodTool::prefsPath; } -- cgit v1.2.3