diff options
| author | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
| commit | 95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4 (patch) | |
| tree | 506de5a8437cb39917a66d74b68d78692d10a993 /src/livarot/ShapeMisc.cpp | |
| parent | Added first support for elliptical arrangements (diff) | |
| parent | powerstroke: cautious fix. (diff) | |
| download | inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.tar.gz inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.zip | |
Trunk merge
(bzr r11073.1.20)
Diffstat (limited to 'src/livarot/ShapeMisc.cpp')
| -rw-r--r-- | src/livarot/ShapeMisc.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp index da268910f..7b170e8a0 100644 --- a/src/livarot/ShapeMisc.cpp +++ b/src/livarot/ShapeMisc.cpp @@ -584,15 +584,13 @@ Shape::MakeTweak (int mode, Shape *a, double power, JoinType join, double miter, enB = a->CyclePrevAt (a->getEdge(i).en, i); } - Geom::Point stD, seD, enD; - double stL, seL, enL; - stD = a->getEdge(stB).dx; - seD = a->getEdge(i).dx; - enD = a->getEdge(enB).dx; + Geom::Point stD = a->getEdge(stB).dx; + Geom::Point seD = a->getEdge(i).dx; + Geom::Point enD = a->getEdge(enB).dx; - stL = sqrt (dot(stD,stD)); - seL = sqrt (dot(seD,seD)); - enL = sqrt (dot(enD,enD)); + double stL = sqrt (dot(stD,stD)); + double seL = sqrt (dot(seD,seD)); + //double enL = sqrt (dot(enD,enD)); MiscNormalize (stD); MiscNormalize (enD); MiscNormalize (seD); @@ -778,15 +776,13 @@ Shape::MakeOffset (Shape * a, double dec, JoinType join, double miter, bool do_p enB = a->CycleNextAt (a->getEdge(i).en, i); } - Geom::Point stD, seD, enD; - double stL, seL, enL; - stD = a->getEdge(stB).dx; - seD = a->getEdge(i).dx; - enD = a->getEdge(enB).dx; + Geom::Point stD = a->getEdge(stB).dx; + Geom::Point seD = a->getEdge(i).dx; + Geom::Point enD = a->getEdge(enB).dx; - stL = sqrt (dot(stD,stD)); - seL = sqrt (dot(seD,seD)); - enL = sqrt (dot(enD,enD)); + double stL = sqrt (dot(stD,stD)); + double seL = sqrt (dot(seD,seD)); + //double enL = sqrt (dot(enD,enD)); MiscNormalize (stD); MiscNormalize (enD); MiscNormalize (seD); |