summaryrefslogtreecommitdiffstats
path: root/src/livarot/ShapeSweep.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-25 19:06:28 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-25 19:06:28 +0000
commit73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch)
tree75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/livarot/ShapeSweep.cpp
parentMerged from trunk (r12419). (diff)
parentRemove unnecessary variable from the GMarkup-based unit parser (diff)
downloadinkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz
inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip
Merge from trunk (r12439).
(bzr r11608.1.108)
Diffstat (limited to 'src/livarot/ShapeSweep.cpp')
-rw-r--r--src/livarot/ShapeSweep.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index ffe5a9d73..c2fd83e31 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -250,8 +250,8 @@ Shape::ConvertToShape (Shape * a, FillRule directed, bool invert)
}
Geom::Point rPtX;
- rPtX[0]= /*Round*/ (ptX[0]);
- rPtX[1]= /*Round*/ (ptX[1]);
+ rPtX[0]= Round (ptX[0]);
+ rPtX[1]= Round (ptX[1]);
int lastPointNo = -1;
lastPointNo = AddPoint (rPtX);
pData[lastPointNo].rx = rPtX;
@@ -1051,8 +1051,8 @@ Shape::Booleen (Shape * a, Shape * b, BooleanOp mod,int cutPathID)
}
Geom::Point rPtX;
- rPtX[0]= /*Round*/ (ptX[0]);
- rPtX[1]= /*Round*/ (ptX[1]);
+ rPtX[0]= Round (ptX[0]);
+ rPtX[1]= Round (ptX[1]);
int lastPointNo = -1;
lastPointNo = AddPoint (rPtX);
pData[lastPointNo].rx = rPtX;