Remove NRRect use from the extension system

(bzr r10582.1.2)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 18950295c..49304de96 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -164,15 +164,14 @@ PrintLatex::finish (Inkscape::Extension::Print *mod)
 }
 
 unsigned int
-PrintLatex::bind(Inkscape::Extension::Print *mod, Geom::Affine const *transform, float opacity)
+PrintLatex::bind(Inkscape::Extension::Print *mod, Geom::Affine const &transform, float opacity)
 {
-    Geom::Affine tr = *transform;
-    
-    if(m_tr_stack.size()){
+    if (m_tr_stack.size()) {
         Geom::Affine tr_top = m_tr_stack.top();
-        m_tr_stack.push(tr * tr_top);
-    }else
-        m_tr_stack.push(tr);
+        m_tr_stack.push(transform * tr_top);
+    } else {
+        m_tr_stack.push(transform);
+    }
 
     return 1;
 }
@@ -194,8 +193,8 @@ unsigned int PrintLatex::comment (Inkscape::Extension::Print * module,
 
 unsigned int
 PrintLatex::fill(Inkscape::Extension::Print *mod,
-        Geom::PathVector const &pathv, Geom::Affine const *transform, SPStyle const *style,
-        NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
+    Geom::PathVector const &pathv, Geom::Affine const &transform, SPStyle const *style,
+    Geom::OptRect const &pbox, Geom::OptRect const &dbox, Geom::OptRect const &bbox)
 {
     if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
 
@@ -227,8 +226,9 @@ PrintLatex::fill(Inkscape::Extension::Print *mod,
 }
 
 unsigned int
-PrintLatex::stroke (Inkscape::Extension::Print *mod, Geom::PathVector const &pathv, const Geom::Affine *transform, const SPStyle *style,
-			      const NRRect *pbox, const NRRect *dbox, const NRRect *bbox)
+PrintLatex::stroke (Inkscape::Extension::Print *mod,
+    Geom::PathVector const &pathv, Geom::Affine const &transform, SPStyle const *style,
+    Geom::OptRect const &pbox, Geom::OptRect const &dbox, Geom::OptRect const &bbox)
 {
     if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned.
 
@@ -277,12 +277,12 @@ PrintLatex::stroke (Inkscape::Extension::Print *mod, Geom::PathVector const &pat
 
 // FIXME: why is 'transform' argument not used?
 void
-PrintLatex::print_pathvector(SVGOStringStream &os, Geom::PathVector const &pathv_in, const Geom::Affine * /*transform*/)
+PrintLatex::print_pathvector(SVGOStringStream &os, Geom::PathVector const &pathv_in, const Geom::Affine & /*transform*/)
 {
     if (pathv_in.empty())
         return;
 
-//    Geom::Affine tf=*transform;   // why was this here?
+//    Geom::Affine tf=transform;   // why was this here?
     Geom::Affine tf_stack=m_tr_stack.top(); // and why is transform argument not used?
     Geom::PathVector pathv = pathv_in * tf_stack; // generates new path, which is a bit slow, but this doesn't have to be performance optimized
 
@@ -304,7 +304,7 @@ PrintLatex::print_pathvector(SVGOStringStream &os, Geom::PathVector const &pathv
 }
 
 void
-PrintLatex::print_2geomcurve(SVGOStringStream &os, Geom::Curve const & c )
+PrintLatex::print_2geomcurve(SVGOStringStream &os, Geom::Curve const &c)
 {
     using Geom::X;
     using Geom::Y;