Merge lp:~fixer21k/inkscape/bugfixes into lp:~inkscape.dev/inkscape/trunk

Proposed by jazzynico on 2015-01-23
Status: Merged
Merged at revision: 13873
Proposed branch: lp:~fixer21k/inkscape/bugfixes
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/ui/tools/flood-tool.cpp (+1/-1)
To merge this branch: bzr merge lp:~fixer21k/inkscape/bugfixes
Reviewer Review Type Date Requested Status
jazzynico (community) Approve on 2015-01-25
Review via email: mp+247446@code.launchpad.net
To post a comment you must log in.
jazzynico (jazzynico) wrote :

Tested on Windows XP, Inkscape trunk revision 13867.
The patch looks good, but need more testing for regressions.

Thanks Kim!

jazzynico (jazzynico) wrote :

Also tested successfully on Crunchbang Waldorf. No obvious regression.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui/tools/flood-tool.cpp'
2--- src/ui/tools/flood-tool.cpp 2014-12-21 21:58:32 +0000
3+++ src/ui/tools/flood-tool.cpp 2015-01-23 16:49:35 +0000
4@@ -621,7 +621,7 @@
5 bool currently_painting_top = false;
6 bool currently_painting_bottom = false;
7
8- unsigned int top_ty = bci.y - 1;
9+ unsigned int top_ty = (bci.y > 0) ? bci.y - 1 : 0;
10 unsigned int bottom_ty = bci.y + 1;
11
12 bool can_paint_top = (top_ty > 0);