summaryrefslogtreecommitdiffstats
path: root/src/livarot/Shape.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/Shape.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/Shape.cpp')
-rw-r--r--src/livarot/Shape.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index 130b1b03a..c29444a33 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -334,8 +334,8 @@ Shape::AddPoint (const Geom::Point x)
pData[n].nextLinkedPoint = -1;
pData[n].askForWindingS = NULL;
pData[n].askForWindingB = -1;
- pData[n].rx[0] = /*Round*/ (p.x[0]);
- pData[n].rx[1] = /*Round*/ (p.x[1]);
+ pData[n].rx[0] = Round(p.x[0]);
+ pData[n].rx[1] = Round(p.x[1]);
}
if (_has_voronoi_data)
{
@@ -2116,8 +2116,8 @@ void Shape::initialisePointData()
pData[i].pending = 0;
pData[i].edgeOnLeft = -1;
pData[i].nextLinkedPoint = -1;
- 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]);
}
_point_data_initialised = true;