remove unused variables

diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index f4d021830670873b93ca52c32450c56977bbc7a0..aaadf14acb57d5a2776ab5f56e84a7df51ff4d40 100644 (file)
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -452,7 +452,7 @@ PrintEmfWin32::flush_fill()
     if (fill_path) {
         stroke_and_fill = false;
         fill_only = true;
-        print_bpath(fill_path, &fill_transform, &fill_pbox);
+        print_bpath(fill_path, fill_transform);
         fill_only = false;
         if (!simple_shape)
             FillPath( hdc );
@@ -557,7 +557,6 @@ PrintEmfWin32::fill(Inkscape::Extension::Print *mod,
     fill_path = copy_bpath( bpath );
     g_free(bpath);
     fill_transform = tf;
-    fill_pbox = *pbox;
 
     // postpone fill in case of stroke-and-fill
 
@@ -589,7 +588,7 @@ PrintEmfWin32::stroke (Inkscape::Extension::Print *mod,
         return 0;
     }
 
-    print_bpath(bpath, &tf, pbox);
+    print_bpath(bpath, tf);
 
     if (stroke_and_fill) {
         if (!simple_shape)
@@ -610,9 +609,9 @@ PrintEmfWin32::stroke (Inkscape::Extension::Print *mod,
 
 
 bool
-PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix *transform, NRRect const *pbox)
+PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix &transform)
 {
-    NR::Matrix tf = *transform;
+    NR::Matrix tf = transform;
     const NArtBpath *bp = bpath;
     
     int nodes = 0;
@@ -768,12 +767,12 @@ PrintEmfWin32::print_simple_shape(const NArtBpath *bpath, const Geom::Matrix *tr
 }
 
 unsigned int
-PrintEmfWin32::print_bpath(NArtBpath const *bp, Geom::Matrix const *transform, NRRect const *pbox)
+PrintEmfWin32::print_bpath(NArtBpath const *bp, Geom::Matrix const &transform)
 {
     unsigned int closed;
-    NR::Matrix tf = *transform;
+    NR::Matrix tf = transform;
 
-    simple_shape = print_simple_shape(bp, transform, pbox);
+    simple_shape = print_simple_shape(bp, transform);
 
     if (simple_shape)
         return TRUE;

diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h
index 63232dad11e7142455af1ab1b724a301e6738d68..c4a7f4990fa3bb92715797a383aa27db7370a18e 100644 (file)
--- a/src/extension/internal/emf-win32-print.h
+++ b/src/extension/internal/emf-win32-print.h
@@ -24,6 +24,7 @@
 #include "svg/stringstream.h"
 #include "libnr/nr-matrix.h"
 #include "libnr/nr-rect.h"
+#include <2geom/pathvector.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -46,16 +47,14 @@ class PrintEmfWin32 : public Inkscape::Extension::Implementation::Implementation
 
     std::stack<Geom::Matrix> m_tr_stack;
     NArtBpath *fill_path;
-    NArtBpath *fill_path_copy;
     Geom::Matrix fill_transform;
-    NRRect fill_pbox;
 //    Geom::Matrix text_transform;
     bool stroke_and_fill;
     bool fill_only;
     bool simple_shape;
 
-    unsigned int print_bpath (const NArtBpath *bp, const Geom::Matrix *transform, NRRect const *pbox);
-    bool print_simple_shape (const NArtBpath *bp, const Geom::Matrix *transform, NRRect const *pbox);
+    unsigned int print_bpath (const NArtBpath *bp, const Geom::Matrix &transform);
+    bool print_simple_shape  (const NArtBpath *bp, const Geom::Matrix &transform);
 
 public:
     PrintEmfWin32 (void);