summaryrefslogtreecommitdiffstats
path: root/src/livarot/Shape.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-07-24 19:53:33 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-07-24 19:53:33 +0000
commit5a37f06c70e0e4e2519812564f4dcdced7c0246a (patch)
treef959f73813cb6f968072aee1100323b24e294136 /src/livarot/Shape.cpp
parentupdate to trunk (diff)
parentFix a bug continuing a bezier path whith a LPE one like spiro or bspline on a... (diff)
downloadinkscape-5a37f06c70e0e4e2519812564f4dcdced7c0246a.tar.gz
inkscape-5a37f06c70e0e4e2519812564f4dcdced7c0246a.zip
update to trunk
(bzr r13879.1.17)
Diffstat (limited to 'src/livarot/Shape.cpp')
-rw-r--r--src/livarot/Shape.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index ac6c72342..0bb3390e8 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -1683,7 +1683,7 @@ Shape::CmpToVert (Geom::Point ax, Geom::Point bx,bool as,bool bs)
Geom::Point av, bv;
av = ax;
bv = bx;
- double si = cross (bv, av);
+ double si = cross(av, bv);
int tstSi = 0;
if (si > 0.000001) tstSi = 1;
if (si < -0.000001) tstSi = -1;
@@ -2104,7 +2104,7 @@ Shape::PtWinding (const Geom::Point px) const
}
Geom::Point const diff = px - ast;
- double const cote = cross(diff, adir);
+ double const cote = cross(adir, diff);
if (cote == 0) continue;
if (cote < 0) {
if (ast[0] > px[0]) lr += nWeight;