2geomify, remove warnings and other fixes

[inkscape.git] / src / extension / internal / emf-win32-print.h

diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h
index 305507824226159f969a6892835539a60fe41037..374aaef459c28da553c501acdd3b16fc555574b6 100644 (file)
--- a/src/extension/internal/emf-win32-print.h
+++ b/src/extension/internal/emf-win32-print.h
@@ -7,7 +7,7 @@
  * Author:
  *   Ulf Erikson <ulferikson@users.sf.net>
  *
- * Copyright (C) 2006 Authors
+ * Copyright (C) 2006-2008 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -19,14 +19,13 @@
 #endif
 
 #include "extension/implementation/implementation.h"
-#include "extension/extension.h"
+//#include "extension/extension.h"
 
-#include "svg/stringstream.h"
-#include "libnr/nr-matrix.h"
-#include "libnr/nr-rect.h"
+//#include "libnr/nr-matrix.h"
+//#include "libnr/nr-rect.h"
+#include <2geom/pathvector.h>
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <stack>
 
 namespace Inkscape {
 namespace Extension {
@@ -42,12 +41,15 @@ class PrintEmfWin32 : public Inkscape::Extension::Implementation::Implementation
     HBRUSH hbrush, hbrushOld;
     HPEN hpen, hpenOld;
 
-    NArtBpath *fill_path;
-    NArtBpath *fill_path_copy;
-    NRMatrix fill_transform;
-    NRRect fill_pbox;
+    std::stack<Geom::Matrix> m_tr_stack;
+    Geom::PathVector fill_pathv;
+    Geom::Matrix fill_transform;
+    bool stroke_and_fill;
+    bool fill_only;
+    bool simple_shape;
 
-    unsigned int print_bpath (const NArtBpath *bp, const NRMatrix *transform, NRRect const *pbox);
+    unsigned int print_pathv (Geom::PathVector const &pathv, const Geom::Matrix &transform);
+    bool print_simple_shape (Geom::PathVector const &pathv, const Geom::Matrix &transform);
 
 public:
     PrintEmfWin32 (void);
@@ -60,31 +62,32 @@ public:
     virtual unsigned int finish (Inkscape::Extension::Print * module);
 
     /* Rendering methods */
+    virtual unsigned int bind(Inkscape::Extension::Print *module, Geom::Matrix const *transform, float opacity);
+    virtual unsigned int release(Inkscape::Extension::Print *module);
     virtual unsigned int fill (Inkscape::Extension::Print * module,
-                               const NRBPath *bpath, const NRMatrix *ctm, const SPStyle *style,
+                               Geom::PathVector const &pathv, const Geom::Matrix *ctm, const SPStyle *style,
                                const NRRect *pbox, const NRRect *dbox, const NRRect *bbox);
     virtual unsigned int stroke (Inkscape::Extension::Print * module,
-                                 const NRBPath *bpath, const NRMatrix *transform, const SPStyle *style,
+                                 Geom::PathVector const &pathv, const Geom::Matrix *transform, const SPStyle *style,
                                  const NRRect *pbox, const NRRect *dbox, const NRRect *bbox);
     virtual unsigned int comment(Inkscape::Extension::Print *module, const char * comment);
+    virtual unsigned int text(Inkscape::Extension::Print *module, char const *text,
+                              Geom::Point p, SPStyle const *style);
     bool textToPath (Inkscape::Extension::Print * ext);
 
     static void init (void);
 
 protected:
-    void create_brush(SPStyle const *style);
+    int create_brush(SPStyle const *style);
 
     void destroy_brush();
 
-    void create_pen(SPStyle const *style);
+    void create_pen(SPStyle const *style, const Geom::Matrix &transform);
 
     void destroy_pen();
 
     void flush_fill();
 
-    NArtBpath *copy_bpath(const NArtBpath *bp);
-    int cmp_bpath(const NArtBpath *bp1, const NArtBpath *bp2);
-
 };
 
 }  /* namespace Internal */