summaryrefslogtreecommitdiffstats
path: root/src/livarot/PathConversion.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2015-07-04 16:15:46 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2015-07-04 16:15:46 +0000
commit1112ab0a12fc0cb5a6b00d1bbd5b100c55eedff8 (patch)
treea91517f9165322b4e42c6cdeb4263beaedc4d02f /src/livarot/PathConversion.cpp
parentPackaging. New Win32 installer Danish translation. (diff)
parentUpgrade to 2Geom r2413 (diff)
downloadinkscape-1112ab0a12fc0cb5a6b00d1bbd5b100c55eedff8.tar.gz
inkscape-1112ab0a12fc0cb5a6b00d1bbd5b100c55eedff8.zip
Sync 2Geom to revision 2413.
May introduce regressions. (bzr r14226)
Diffstat (limited to 'src/livarot/PathConversion.cpp')
-rw-r--r--src/livarot/PathConversion.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/livarot/PathConversion.cpp b/src/livarot/PathConversion.cpp
index 42df898e6..30e21d546 100644
--- a/src/livarot/PathConversion.cpp
+++ b/src/livarot/PathConversion.cpp
@@ -716,7 +716,7 @@ static void ArcAnglesAndCenter(Geom::Point const &iS, Geom::Point const &iE,
{
Geom::Point se = iE - iS;
Geom::Point ca(cos(angle), sin(angle));
- Geom::Point cse(dot(se, ca), cross(se, ca));
+ Geom::Point cse(dot(ca, se), cross(ca, se));
cse[0] /= rx;
cse[1] /= ry;
double const lensq = dot(cse,cse);
@@ -753,8 +753,8 @@ static void ArcAnglesAndCenter(Geom::Point const &iS, Geom::Point const &iE,
csd[1] *= ry;
ca[1] = -ca[1]; // because it's the inverse rotation
- dr[0] = dot(csd, ca);
- dr[1] = cross(csd, ca);
+ dr[0] = dot(ca, csd);
+ dr[1] = cross(ca, csd);
ca[1] = -ca[1];