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/transf_mat_3x4.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/transf_mat_3x4.cpp')
| -rw-r--r-- | src/transf_mat_3x4.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/transf_mat_3x4.cpp b/src/transf_mat_3x4.cpp index 533972e29..20eee658c 100644 --- a/src/transf_mat_3x4.cpp +++ b/src/transf_mat_3x4.cpp @@ -13,7 +13,7 @@ #include "transf_mat_3x4.h" #include <gtk/gtk.h> -#include <2geom/matrix.h> +#include <2geom/affine.h> #include "svg/stringstream.h" #include "syseq.h" #include "document.h" @@ -133,7 +133,7 @@ TransfMat3x4::operator==(const TransfMat3x4 &rhs) const /* Multiply a projective matrix by an affine matrix (by only multiplying the 'affine part' of the * projective matrix) */ TransfMat3x4 -TransfMat3x4::operator*(Geom::Matrix const &A) const { +TransfMat3x4::operator*(Geom::Affine const &A) const { TransfMat3x4 ret; for (int j = 0; j < 4; ++j) { @@ -148,7 +148,7 @@ TransfMat3x4::operator*(Geom::Matrix const &A) const { // FIXME: Shouldn't rather operator* call operator*= for efficiency? (Because in operator*= // there is in principle no need to create a temporary object, which happens in the assignment) TransfMat3x4 & -TransfMat3x4::operator*=(Geom::Matrix const &A) { +TransfMat3x4::operator*=(Geom::Affine const &A) { *this = *this * A; return *this; } |