diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
| commit | 945ce419c806c73d70203dec33ececafbe108a92 (patch) | |
| tree | cfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/livarot/path-description.cpp | |
| parent | Merge from trunk (again) (diff) | |
| parent | Extensions. SVG+media fix (see Bug #400356). (diff) | |
| download | inkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip | |
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/livarot/path-description.cpp')
| -rw-r--r-- | src/livarot/path-description.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/livarot/path-description.cpp b/src/livarot/path-description.cpp index fd91cb447..c34965a5c 100644 --- a/src/livarot/path-description.cpp +++ b/src/livarot/path-description.cpp @@ -1,5 +1,5 @@ #include "livarot/path-description.h" -#include <2geom/matrix.h> +#include <2geom/affine.h> PathDescr *PathDescrMoveTo::clone() const { @@ -11,7 +11,7 @@ void PathDescrMoveTo::dumpSVG(Inkscape::SVGOStringStream& s, Geom::Point const & s << "M " << p[Geom::X] << " " << p[Geom::Y] << " "; } -void PathDescrMoveTo::transform(Geom::Matrix const& t) +void PathDescrMoveTo::transform(Geom::Affine const& t) { p = p * t; } @@ -32,7 +32,7 @@ PathDescr *PathDescrLineTo::clone() const return new PathDescrLineTo(*this); } -void PathDescrLineTo::transform(Geom::Matrix const& t) +void PathDescrLineTo::transform(Geom::Affine const& t) { p = p * t; } @@ -48,7 +48,7 @@ PathDescr *PathDescrBezierTo::clone() const return new PathDescrBezierTo(*this); } -void PathDescrBezierTo::transform(Geom::Matrix const& t) +void PathDescrBezierTo::transform(Geom::Affine const& t) { p = p * t; } @@ -64,7 +64,7 @@ PathDescr *PathDescrIntermBezierTo::clone() const return new PathDescrIntermBezierTo(*this); } -void PathDescrIntermBezierTo::transform(Geom::Matrix const& t) +void PathDescrIntermBezierTo::transform(Geom::Affine const& t) { p = p * t; } @@ -100,9 +100,9 @@ void PathDescrCubicTo::dump(std::ostream &s) const << end[Geom::X] << " " << end[Geom::Y] << " "; } -void PathDescrCubicTo::transform(Geom::Matrix const& t) +void PathDescrCubicTo::transform(Geom::Affine const& t) { - Geom::Matrix tr = t; + Geom::Affine tr = t; tr[4] = tr[5] = 0; start = start * tr; end = end * tr; @@ -127,7 +127,7 @@ PathDescr *PathDescrArcTo::clone() const return new PathDescrArcTo(*this); } -void PathDescrArcTo::transform(Geom::Matrix const& t) +void PathDescrArcTo::transform(Geom::Affine const& t) { p = p * t; } |