diff options
| author | Alvin Penner <penner@vaxxine.com> | 2013-04-18 19:43:04 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2013-04-18 19:43:04 +0000 |
| commit | d20a076c12c540131c3b0648e7733916b9526e6b (patch) | |
| tree | c9b0e40930df30e447097edd9409308905d24bae /src | |
| parent | Change symbols icon and give minimum size for dialog (diff) | |
| download | inkscape-d20a076c12c540131c3b0648e7733916b9526e6b.tar.gz inkscape-d20a076c12c540131c3b0648e7733916b9526e6b.zip | |
Path Union. fix for Bug 614577
Fixed bugs:
- https://launchpad.net/bugs/614577
(bzr r12279)
Diffstat (limited to 'src')
| -rw-r--r-- | src/livarot/ShapeSweep.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp index 2073d1cd2..c2fd83e31 100644 --- a/src/livarot/ShapeSweep.cpp +++ b/src/livarot/ShapeSweep.cpp @@ -2741,8 +2741,9 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/, { if (TesteAdjacency (lS, lB, getPoint(n).x, n, false) == false) - break; - lS->swsData[lB].leftRnd = n; + break; + if (getPoint(lS->swsData[lB].leftRnd).x[0] > getPoint(n).x[0] + HalfRound (1)) // LP Bug 614577 + lS->swsData[lB].leftRnd = n; } for (int n = rgtN + 1; n < lastPointNo; n++) { @@ -2768,7 +2769,8 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/, if (TesteAdjacency (rS, rB, getPoint(n).x, n, false) == false) break; - rS->swsData[rB].leftRnd = n; + if (getPoint(rS->swsData[rB].leftRnd).x[0] > getPoint(n).x[0] + HalfRound (1)) // LP Bug 614577 + rS->swsData[rB].leftRnd = n; } for (int n = rgtN + 1; n < lastPointNo; n++) { |