From 84194ec2d0b9830437a5470320422265d5dd8c35 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 12:20:13 +0200 Subject: Remove NRRect use from the extension system (bzr r10582.1.2) --- src/print.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/print.cpp') diff --git a/src/print.cpp b/src/print.cpp index 3e477c976..d2fc72175 100644 --- a/src/print.cpp +++ b/src/print.cpp @@ -27,17 +27,8 @@ #include "ui/dialog/print.h" - -/* Identity typedef */ - -unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Affine const &transform, float opacity) -{ - Geom::Affine const ntransform(transform); - return sp_print_bind(ctx, &ntransform, opacity); -} - unsigned int -sp_print_bind(SPPrintContext *ctx, Geom::Affine const *transform, float opacity) +sp_print_bind(SPPrintContext *ctx, Geom::Affine const &transform, float opacity) { return ctx->module->bind(transform, opacity); } @@ -55,25 +46,23 @@ sp_print_comment(SPPrintContext *ctx, char const *comment) } unsigned int -sp_print_fill(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Affine const *ctm, SPStyle const *style, +sp_print_fill(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, Geom::OptRect const &bbox) { - NRRect nrpbox(pbox), nrdbox(dbox), nrbbox(bbox); - return ctx->module->fill(pathv, ctm, style, &nrpbox, &nrdbox, &nrbbox); + return ctx->module->fill(pathv, ctm, style, pbox, dbox, bbox); } unsigned int -sp_print_stroke(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Affine const *ctm, SPStyle const *style, +sp_print_stroke(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Affine const &ctm, SPStyle const *style, Geom::OptRect const &pbox, Geom::OptRect const &dbox, Geom::OptRect const &bbox) { - NRRect nrpbox(pbox), nrdbox(dbox), nrbbox(bbox); - return ctx->module->stroke(pathv, ctm, style, &nrpbox, &nrdbox, &nrbbox); + return ctx->module->stroke(pathv, ctm, style, pbox, dbox, bbox); } unsigned int sp_print_image_R8G8B8A8_N(SPPrintContext *ctx, guchar *px, unsigned int w, unsigned int h, unsigned int rs, - Geom::Affine const *transform, SPStyle const *style) + Geom::Affine const &transform, SPStyle const *style) { return ctx->module->image(px, w, h, rs, transform, style); } -- cgit v1.2.3