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/display/pixblock-transform.cpp | |
| 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/display/pixblock-transform.cpp')
| -rw-r--r-- | src/display/pixblock-transform.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/display/pixblock-transform.cpp b/src/display/pixblock-transform.cpp index 78324434a..5d5b8a9cf 100644 --- a/src/display/pixblock-transform.cpp +++ b/src/display/pixblock-transform.cpp @@ -23,7 +23,7 @@ using std::floor; #include "libnr/nr-blit.h" #include "libnr/nr-pixblock.h" -#include <2geom/matrix.h> +#include <2geom/affine.h> namespace NR { @@ -48,7 +48,7 @@ inline void _check_index(NRPixBlock const * const pb, int const location, int co } } -void transform_nearest(NRPixBlock *to, NRPixBlock *from, Geom::Matrix const &trans) +void transform_nearest(NRPixBlock *to, NRPixBlock *from, Geom::Affine const &trans) { if (NR_PIXBLOCK_BPP(from) != 4 || NR_PIXBLOCK_BPP(to) != 4) { g_warning("A non-32-bpp image passed to transform_nearest: scaling aborted."); @@ -70,7 +70,7 @@ void transform_nearest(NRPixBlock *to, NRPixBlock *from, Geom::Matrix const &tra int to_width = to->area.x1 - to->area.x0; int to_height = to->area.y1 - to->area.y0; - Geom::Matrix itrans = trans.inverse(); + Geom::Affine itrans = trans.inverse(); // Loop through every pixel of destination image, a line at a time for (int to_y = 0 ; to_y < to_height ; to_y++) { @@ -133,7 +133,7 @@ inline static double sample(double const a, double const b, return sum; } -void transform_bicubic(NRPixBlock *to, NRPixBlock *from, Geom::Matrix const &trans) +void transform_bicubic(NRPixBlock *to, NRPixBlock *from, Geom::Affine const &trans) { if (NR_PIXBLOCK_BPP(from) != 4 || NR_PIXBLOCK_BPP(to) != 4) { g_warning("A non-32-bpp image passed to transform_bicubic: scaling aborted."); @@ -160,7 +160,7 @@ void transform_bicubic(NRPixBlock *to, NRPixBlock *from, Geom::Matrix const &tra int to_width = to->area.x1 - to->area.x0; int to_height = to->area.y1 - to->area.y0; - Geom::Matrix itrans = trans.inverse(); + Geom::Affine itrans = trans.inverse(); // Loop through every pixel of destination image, a line at a time for (int to_y = 0 ; to_y < to_height ; to_y++) { |