diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2011-02-02 21:24:36 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2011-02-02 21:24:36 +0000 |
| commit | 53933f5fea9d07d1ba6304b88439fba257ee8c34 (patch) | |
| tree | 21f94cd05346fc1236751bb1db3e0850e5aece54 /src/libnr | |
| parent | Translations. French translation minor update. (diff) | |
| download | inkscape-53933f5fea9d07d1ba6304b88439fba257ee8c34.tar.gz inkscape-53933f5fea9d07d1ba6304b88439fba257ee8c34.zip | |
update to latest 2geom !
(bzr r10025)
Diffstat (limited to 'src/libnr')
| -rw-r--r-- | src/libnr/nr-convert2geom.h | 8 | ||||
| -rw-r--r-- | src/libnr/nr-matrix.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libnr/nr-convert2geom.h b/src/libnr/nr-convert2geom.h index b4bca3516..2f87632fb 100644 --- a/src/libnr/nr-convert2geom.h +++ b/src/libnr/nr-convert2geom.h @@ -12,7 +12,7 @@ #include <libnr/nr-matrix.h> #include <libnr/nr-rect.h> #include <libnr/nr-point.h> -#include <2geom/matrix.h> +#include <2geom/affine.h> #include <2geom/d2.h> #include <2geom/transforms.h> #include <2geom/point.h> @@ -24,11 +24,11 @@ inline NR::Point from_2geom(Geom::Point const & _pt) { return NR::Point(_pt[0], _pt[1]); } -inline Geom::Matrix to_2geom(NR::Matrix const & mat) { - Geom::Matrix mat2geom(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); +inline Geom::Affine to_2geom(NR::Matrix const & mat) { + Geom::Affine mat2geom(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); return mat2geom; } -inline NR::Matrix from_2geom(Geom::Matrix const & mat) { +inline NR::Matrix from_2geom(Geom::Affine const & mat) { NR::Matrix mat2geom(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); return mat2geom; } diff --git a/src/libnr/nr-matrix.h b/src/libnr/nr-matrix.h index 206ff18b6..5d62dfafe 100644 --- a/src/libnr/nr-matrix.h +++ b/src/libnr/nr-matrix.h @@ -25,7 +25,7 @@ #include <libnr/nr-rotate.h> #include <libnr/nr-scale.h> #include <libnr/nr-translate.h> -#include <2geom/matrix.h> +#include <2geom/affine.h> namespace NR { @@ -78,7 +78,7 @@ class Matrix { } - Matrix(Geom::Matrix const &m) { + Matrix(Geom::Affine const &m) { NR::Coord *dest = _c; *dest++ = m[0]; @@ -231,8 +231,8 @@ class Matrix { return _c[i]; } - inline operator Geom::Matrix() const { - return Geom::Matrix(_c[0], _c[1], _c[2], _c[3], _c[4], _c[5]); + inline operator Geom::Affine() const { + return Geom::Affine(_c[0], _c[1], _c[2], _c[3], _c[4], _c[5]); } /** |