diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-10-08 16:05:13 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-10-08 16:05:13 +0000 |
| commit | 6092d5422b03608db00f18e6ad8c87465b5dc3e8 (patch) | |
| tree | 2ae791c03acda4ca0bf1cc2fb309a94c39cbd058 /src/livarot/PathOutline.cpp | |
| parent | [Bug #770681] KEY MAPPING: Comma and period hijacked by scaling. (diff) | |
| parent | Made the style-utils.h license dual-with-GPLv2+. (diff) | |
| download | inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.tar.gz inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.zip | |
merge trunk-refactoring
(bzr r15156)
Diffstat (limited to 'src/livarot/PathOutline.cpp')
| -rw-r--r-- | src/livarot/PathOutline.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/livarot/PathOutline.cpp b/src/livarot/PathOutline.cpp index 0683d8ae8..7043469d2 100644 --- a/src/livarot/PathOutline.cpp +++ b/src/livarot/PathOutline.cpp @@ -424,7 +424,7 @@ void Path::SubContractOutline(int off, int num_pd, } else if (nType == descr_close) { - if (doFirst == false) + if (! doFirst) { if (Geom::LInfty (curX - firstP) < 0.0001) { @@ -810,7 +810,7 @@ void Path::SubContractOutline(int off, int num_pd, } if (closeIfNeeded) { - if (doFirst == false) + if (! doFirst) { } } @@ -853,7 +853,7 @@ Path::IsNulCurve (std::vector<PathDescr*> const &cmd, int curD, Geom::Point cons { PathDescrArcTo* nData = dynamic_cast<PathDescrArcTo*>(cmd[curD]); if ( Geom::LInfty(nData->p - curX) < 0.00001) { - if ((nData->large == false) + if ((! nData->large) || (fabs (nData->rx) < 0.00001 || fabs (nData->ry) < 0.00001)) { return true; @@ -1004,7 +1004,7 @@ void Path::TangentOnArcAt(double at, const Geom::Point &iS, PathDescrArcTo const if (wise) { - if (large == true) + if (large) { drx = -drx; dry = -dry; @@ -1021,7 +1021,7 @@ void Path::TangentOnArcAt(double at, const Geom::Point &iS, PathDescrArcTo const } else { - if (large == false) + if (! large) { drx = -drx; dry = -dry; |