X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fprint.h;h=f566d4e31b3ba0d69380e661323e17810e0ee46f;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=dd5c1fa7354344f8066803cb38b05caccdaa56cd;hpb=3955580a5a68a873b098921626f5b9d841b964ec;p=inkscape.git

diff --git a/src/print.h b/src/print.h
index dd5c1fa73..f566d4e31 100644
--- a/src/print.h
+++ b/src/print.h
@@ -12,7 +12,8 @@
  */
 
 #include <gtkmm.h>
-#include <libnr/nr-path.h>
+//#include <libnr/nr-path.h>
+#include <2geom/forward.h>
 #include "forward.h"
 #include "extension/extension-forward.h"
 
@@ -20,20 +21,20 @@ struct SPPrintContext {
     Inkscape::Extension::Print *module;
 };
 
-unsigned int sp_print_bind(SPPrintContext *ctx, NR::Matrix const &transform, float opacity);
-unsigned int sp_print_bind(SPPrintContext *ctx, NR::Matrix const *transform, float opacity);
+unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Matrix const &transform, float opacity);
+unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Matrix const *transform, float opacity);
 unsigned int sp_print_release(SPPrintContext *ctx);
 unsigned int sp_print_comment(SPPrintContext *ctx, char const *comment);
-unsigned int sp_print_fill(SPPrintContext *ctx, NRBPath const *bpath, NR::Matrix const *ctm, SPStyle const *style,
+unsigned int sp_print_fill(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *ctm, SPStyle const *style,
                            NRRect const *pbox, NRRect const *dbox, NRRect const *bbox);
-unsigned int sp_print_stroke(SPPrintContext *ctx, NRBPath const *bpath, NR::Matrix const *transform, SPStyle const *style,
+unsigned int sp_print_stroke(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *transform, SPStyle const *style,
                              NRRect const *pbox, NRRect const *dbox, NRRect const *bbox);
 
 unsigned int sp_print_image_R8G8B8A8_N(SPPrintContext *ctx,
                                        guchar *px, unsigned int w, unsigned int h, unsigned int rs,
-                                       NR::Matrix const *transform, SPStyle const *style);
+                                       Geom::Matrix const *transform, SPStyle const *style);
 
-unsigned int sp_print_text(SPPrintContext *ctx, char const *text, NR::Point p,
+unsigned int sp_print_text(SPPrintContext *ctx, char const *text, Geom::Point p,
                            SPStyle const *style);
 
 void sp_print_get_param(SPPrintContext *ctx, gchar *name, bool *value);
@@ -56,4 +57,4 @@ void sp_print_document_to_file(SPDocument *doc, gchar const *filename);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :