summaryrefslogtreecommitdiffstats
path: root/src/livarot/PathStroke.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2015-04-28 23:02:19 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2015-04-28 23:02:19 +0000
commitcfa7054c950050095e596edd18fedad53e7ed636 (patch)
tree2142ac03239c40a4af6b367754ddf3421e337577 /src/livarot/PathStroke.cpp
parent2Geom sync - initial commit (diff)
downloadinkscape-cfa7054c950050095e596edd18fedad53e7ed636.tar.gz
inkscape-cfa7054c950050095e596edd18fedad53e7ed636.zip
Fix calls to Geom::cross() - sign change.
(bzr r14059.2.2)
Diffstat (limited to 'src/livarot/PathStroke.cpp')
-rw-r--r--src/livarot/PathStroke.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/livarot/PathStroke.cpp b/src/livarot/PathStroke.cpp
index 6ec7fa209..4cfeb887a 100644
--- a/src/livarot/PathStroke.cpp
+++ b/src/livarot/PathStroke.cpp
@@ -292,7 +292,7 @@ void Path::DoJoin (Shape *dest, double width, JoinType join, Geom::Point pos, Ge
{
Geom::Point pnor = prev.ccw();
Geom::Point nnor = next.ccw();
- double angSi = cross(next, prev);
+ double angSi = cross(prev, next);
/* FIXED: this special case caused bug 1028953 */
if (angSi > -0.0001 && angSi < 0.0001) {
@@ -416,7 +416,7 @@ Path::DoLeftJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
{
Geom::Point pnor=prev.ccw();
Geom::Point nnor=next.ccw();
- double angSi = cross (next, prev);
+ double angSi = cross(prev, next);
if (angSi > -0.0001 && angSi < 0.0001)
{
double angCo = dot (prev, next);
@@ -444,7 +444,7 @@ Path::DoLeftJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
/* Geom::Point biss;
biss.x=next.x-prev.x;
biss.y=next.y-prev.y;
- double c2=cross(biss,next);
+ double c2=cross(next, biss);
double l=width/c2;
double projn=l*(dot(biss,next));
double projp=-l*(dot(biss,prev));
@@ -503,7 +503,7 @@ Path::DoLeftJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
}
else
{
- double s2 = cross (biss, nnor);
+ double s2 = cross(nnor, biss);
double dec = (l - emiter) * c2 / s2;
const Geom::Point tbiss=biss.ccw();
@@ -560,7 +560,7 @@ Path::DoRightJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
{
const Geom::Point pnor=prev.ccw();
const Geom::Point nnor=next.ccw();
- double angSi = cross (next,prev);
+ double angSi = cross(prev, next);
if (angSi > -0.0001 && angSi < 0.0001)
{
double angCo = dot (prev, next);
@@ -614,7 +614,7 @@ Path::DoRightJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
}
else
{
- double s2 = cross (biss, nnor);
+ double s2 = cross(nnor, biss);
double dec = (l - emiter) * c2 / s2;
const Geom::Point tbiss=biss.ccw();
@@ -667,7 +667,7 @@ Path::DoRightJoin (Shape * dest, double width, JoinType join, Geom::Point pos,
/* Geom::Point biss;
biss=next.x-prev.x;
biss.y=next.y-prev.y;
- double c2=cross(next,biss);
+ double c2=cross(biss, next);
double l=width/c2;
double projn=l*(dot(biss,next));
double projp=-l*(dot(biss,prev));
@@ -719,7 +719,7 @@ void Path::RecRound(Shape *dest, int sNo, int eNo, // start and end index
sia = 1;
} else {
double coa = dot(nS, nE);
- sia = cross(nS, nE);
+ sia = cross(nE, nS);
ang = acos(coa);
if ( coa >= 1 ) {
ang = 0;