summaryrefslogtreecommitdiffstats
path: root/src/livarot/ShapeMisc.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/ShapeMisc.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/ShapeMisc.cpp')
-rw-r--r--src/livarot/ShapeMisc.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index 5bb8a25ef..6fd40790f 100644
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -49,8 +49,8 @@ Shape::ConvertToForme (Path * dest)
for (int i = 0; i < numberOfPoints(); i++)
{
- pData[i].rx[0] = /*Round*/ (getPoint(i).x[0]);
- pData[i].rx[1] = /*Round*/ (getPoint(i).x[1]);
+ pData[i].rx[0] = Round (getPoint(i).x[0]);
+ pData[i].rx[1] = Round (getPoint(i).x[1]);
}
for (int i = 0; i < numberOfEdges(); i++)
{
@@ -199,8 +199,8 @@ Shape::ConvertToForme (Path * dest, int nbP, Path * *orig, bool splitWhenForced)
for (int i = 0; i < numberOfPoints(); i++)
{
- pData[i].rx[0] = /*Round*/ (getPoint(i).x[0]);
- pData[i].rx[1] = /*Round*/ (getPoint(i).x[1]);
+ pData[i].rx[0] = Round (getPoint(i).x[0]);
+ pData[i].rx[1] = Round (getPoint(i).x[1]);
}
for (int i = 0; i < numberOfEdges(); i++)
{
@@ -352,8 +352,8 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
for (int i = 0; i < numberOfPoints(); i++)
{
- pData[i].rx[0] = /*Round*/ (getPoint(i).x[0]);
- pData[i].rx[1] = /*Round*/ (getPoint(i).x[1]);
+ pData[i].rx[0] = Round (getPoint(i).x[0]);
+ pData[i].rx[1] = Round (getPoint(i).x[1]);
}
for (int i = 0; i < numberOfEdges(); i++)
{