diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-31 14:21:11 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-31 14:21:11 +0000 |
| commit | 49473f0b4dd4c9b7c03eea00190ecff741915d78 (patch) | |
| tree | 69d3dca2f18b81e59ec3d0f25fbcb0265c97a5bc /src | |
| parent | cairo-render-context extension implementation converted to 2geom (diff) | |
| download | inkscape-49473f0b4dd4c9b7c03eea00190ecff741915d78.tar.gz inkscape-49473f0b4dd4c9b7c03eea00190ecff741915d78.zip | |
remove unused variables
(bzr r6737)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/emf-win32-print.cpp | 15 | ||||
| -rw-r--r-- | src/extension/internal/emf-win32-print.h | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp index f4d021830..aaadf14ac 100644 --- 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 63232dad1..c4a7f4990 100644 --- 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); |