Merge from trunk

(bzr r9508.1.73)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/extension/print.cpp b/src/extension/print.cpp
index 2d4177d60..ad8c4c38d 100644
--- a/src/extension/print.cpp
+++ b/src/extension/print.cpp
@@ -61,7 +61,7 @@ Print::finish (void)
 }
 
 unsigned int
-Print::bind (const Geom::Matrix *transform, float opacity)
+Print::bind (const Geom::Affine *transform, float opacity)
 {
     return imp->bind (this, transform, opacity);
 }
@@ -79,14 +79,14 @@ Print::comment (const char * comment)
 }
 
 unsigned int
-Print::fill (Geom::PathVector const &pathv, const Geom::Matrix *ctm, const SPStyle *style,
+Print::fill (Geom::PathVector const &pathv, const Geom::Affine *ctm, const SPStyle *style,
                    const NRRect *pbox, const NRRect *dbox, const NRRect *bbox)
 {
     return imp->fill (this, pathv, ctm, style, pbox, dbox, bbox);
 }
 
 unsigned int
-Print::stroke (Geom::PathVector const &pathv, const Geom::Matrix *transform, const SPStyle *style,
+Print::stroke (Geom::PathVector const &pathv, const Geom::Affine *transform, const SPStyle *style,
                  const NRRect *pbox, const NRRect *dbox, const NRRect *bbox)
 {
     return imp->stroke (this, pathv, transform, style, pbox, dbox, bbox);
@@ -94,7 +94,7 @@ Print::stroke (Geom::PathVector const &pathv, const Geom::Matrix *transform, con
 
 unsigned int
 Print::image (unsigned char *px, unsigned int w, unsigned int h, unsigned int rs,
-                const Geom::Matrix *transform, const SPStyle *style)
+                const Geom::Affine *transform, const SPStyle *style)
 {
     return imp->image (this, px, w, h, rs, transform, style);
 }