diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-04-18 20:26:00 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-04-18 20:26:00 +0000 |
| commit | 89922cdfe7c28fbe5f0ca6e4e0d800b5b1f49604 (patch) | |
| tree | 3a4b47d67743abeeba37a843149e9d3234722db9 /src/livarot/ShapeSweep.cpp | |
| parent | Back to original colors (diff) | |
| parent | Path Union. fix for Bug 614577 (diff) | |
| download | inkscape-89922cdfe7c28fbe5f0ca6e4e0d800b5b1f49604.tar.gz inkscape-89922cdfe7c28fbe5f0ca6e4e0d800b5b1f49604.zip | |
Striped colors and outline, fix icons.svg error,mark for merge
(bzr r11950.1.100)
Diffstat (limited to 'src/livarot/ShapeSweep.cpp')
| -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++) { |