summaryrefslogtreecommitdiffstats
path: root/src/livarot/ShapeMisc.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-07-02 03:42:25 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-07-02 03:42:25 +0000
commit70a0fd65c46064941696a5a9366547e1e9d020e2 (patch)
tree1fb73902d467d88b12e978b6de85c0f8f4ca7e9f /src/livarot/ShapeMisc.cpp
parentPorted "ui/widget/page-sizer.cpp" and "document.cpp" to "Util::Unit" class. (diff)
parentShape calculations. do not quantize the coordinates. (Bug 168158) (diff)
downloadinkscape-70a0fd65c46064941696a5a9366547e1e9d020e2.tar.gz
inkscape-70a0fd65c46064941696a5a9366547e1e9d020e2.zip
Merge from trunk.
(bzr r12380.1.5)
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 6fd40790f..5bb8a25ef 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++)
{