diff options
| author | Alvin Penner <penner@vaxxine.com> | 2013-09-15 20:09:57 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2013-09-15 20:09:57 +0000 |
| commit | 96ada89a33df01376c60261f4046be52d7db185e (patch) | |
| tree | 051151d3045f03a6e9347d2ddcbe9eab039b3996 /src/livarot/ShapeSweep.cpp | |
| parent | Scale rendering of pattern fill of text when chaning zoom level; partial fix ... (diff) | |
| download | inkscape-96ada89a33df01376c60261f4046be52d7db185e.tar.gz inkscape-96ada89a33df01376c60261f4046be52d7db185e.zip | |
Path->Inset trial 2. revert rev 12279. (fix Bug 1218333)
Fixed bugs:
- https://launchpad.net/bugs/1218333
(bzr r12524)
Diffstat (limited to 'src/livarot/ShapeSweep.cpp')
| -rw-r--r-- | src/livarot/ShapeSweep.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp index 1954139fa..b04b36bfd 100644 --- a/src/livarot/ShapeSweep.cpp +++ b/src/livarot/ShapeSweep.cpp @@ -2672,8 +2672,7 @@ Shape::TesteAdjacency (Shape * a, int no, const Geom::Point atx, int nPt, double e = IHalfRound ((cross (diff,adir)) * a->eData[no].isqlength); if (-3 < e && e < 3) { - double rad = HalfRound (1); -// double rad = HalfRound (0.501); // when using single precision, 0.505 is better (0.5 would be the correct value, + double rad = HalfRound (0.501); // when using single precision, 0.505 is better (0.5 would be the correct value, // but it produces lots of bugs) diff1[0] = diff[0] - rad; diff1[1] = diff[1] - rad; @@ -2741,8 +2740,7 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/, if (TesteAdjacency (lS, lB, getPoint(n).x, n, false) == false) break; - if (getPoint(lS->swsData[lB].leftRnd).x[0] > getPoint(n).x[0] + HalfRound (1)) // LP Bug 614577 - lS->swsData[lB].leftRnd = n; + lS->swsData[lB].leftRnd = n; } for (int n = rgtN + 1; n < lastPointNo; n++) { @@ -2768,8 +2766,7 @@ Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/, if (TesteAdjacency (rS, rB, getPoint(n).x, n, false) == false) break; - if (getPoint(rS->swsData[rB].leftRnd).x[0] > getPoint(n).x[0] + HalfRound (1)) // LP Bug 614577 - rS->swsData[rB].leftRnd = n; + rS->swsData[rB].leftRnd = n; } for (int n = rgtN + 1; n < lastPointNo; n++) { |