From c2c87b6c05bda491b423488fa6a63b1c5f240749 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Tue, 30 Dec 2008 22:14:34 +0000 Subject: get rid of a lot of no longer needed "libnr/nr-..." includes. (bzr r7045) --- src/display/canvas-bpath.cpp | 2 -- src/display/canvas-text.cpp | 1 - src/display/nr-3dutils.cpp | 1 - src/display/nr-arena-glyphs.cpp | 8 +++----- src/display/nr-arena-group.cpp | 2 -- src/display/nr-arena-image.cpp | 2 +- src/display/nr-arena-image.h | 1 - src/display/nr-arena-item.cpp | 3 --- src/display/nr-arena-item.h | 3 +-- 9 files changed, 5 insertions(+), 18 deletions(-) (limited to 'src/display') diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp index 357d67359..aa4b40e17 100644 --- a/src/display/canvas-bpath.cpp +++ b/src/display/canvas-bpath.cpp @@ -22,9 +22,7 @@ #include "display/display-forward.h" #include "display/curve.h" #include "display/inkscape-cairo.h" -#include "libnr/nr-matrix-fns.h" #include -#include #include "helper/geom.h" /* diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp index f7a8cfb01..e46112a09 100644 --- a/src/display/canvas-text.cpp +++ b/src/display/canvas-text.cpp @@ -25,7 +25,6 @@ #endif #include -#include #include static void sp_canvastext_class_init (SPCanvasTextClass *klass); diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp index 4a4cb78ec..ffeaebe8e 100644 --- a/src/display/nr-3dutils.cpp +++ b/src/display/nr-3dutils.cpp @@ -12,7 +12,6 @@ #include #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" #include "display/nr-3dutils.h" #include diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp index ef60f0502..802fe448c 100644 --- a/src/display/nr-arena-glyphs.cpp +++ b/src/display/nr-arena-glyphs.cpp @@ -17,8 +17,6 @@ # include #endif #include -#include -#include #include #include <2geom/matrix.h> #include "../style.h" @@ -146,7 +144,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*s if (!glyphs->style->fill.isNone()) { Geom::Matrix t; - t = to_2geom(glyphs->g_transform) * gc->transform; + t = glyphs->g_transform * gc->transform; glyphs->x = t[4]; glyphs->y = t[5]; t[4]=0; @@ -168,7 +166,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*s if (!glyphs->style->stroke.isNone()) { /* Build state data */ Geom::Matrix t; - t = to_2geom(glyphs->g_transform) * gc->transform; + t = glyphs->g_transform * gc->transform; glyphs->x = t[4]; glyphs->y = t[5]; t[4]=0; @@ -465,7 +463,7 @@ nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPi Geom::PathVector const * pathv = g->font->PathVector(g->glyph); cairo_new_path(ct); - Geom::Matrix transform = to_2geom(g->g_transform) * group->ctm; + Geom::Matrix transform = g->g_transform * group->ctm; feed_pathvector_to_cairo (ct, *pathv, transform, to_2geom((pb->area).upgrade()), false, 0); cairo_fill(ct); pb->empty = FALSE; diff --git a/src/display/nr-arena-group.cpp b/src/display/nr-arena-group.cpp index d63d9b704..7692cbf15 100644 --- a/src/display/nr-arena-group.cpp +++ b/src/display/nr-arena-group.cpp @@ -22,8 +22,6 @@ #include "sp-gaussian-blur.h" #include "filters/blend.h" #include "display/nr-filter-blend.h" -#include "libnr/nr-matrix-fns.h" -#include "libnr/nr-matrix-ops.h" #include "helper/geom.h" static void nr_arena_group_class_init (NRArenaGroupClass *klass); diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp index 3778dc642..147513f6b 100644 --- a/src/display/nr-arena-image.cpp +++ b/src/display/nr-arena-image.cpp @@ -149,7 +149,7 @@ nr_arena_image_update( NRArenaItem *item, NRRectL */*area*/, NRGC *gc, unsigned image->c10 = (Geom::Point(bbox.x1, bbox.y0) * gc->transform); image->c11 = (Geom::Point(bbox.x1, bbox.y1) * gc->transform); - nr_rect_d_matrix_transform (&bbox, &bbox, from_2geom(gc->transform)); + nr_rect_d_matrix_transform (&bbox, &bbox, gc->transform); item->bbox.x0 = (int) floor (bbox.x0); item->bbox.y0 = (int) floor (bbox.y0); diff --git a/src/display/nr-arena-image.h b/src/display/nr-arena-image.h index d4653a692..209cb8de6 100644 --- a/src/display/nr-arena-image.h +++ b/src/display/nr-arena-image.h @@ -17,7 +17,6 @@ #define NR_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_CAST ((o), NR_TYPE_ARENA_IMAGE, NRArenaImage)) #define NR_IS_ARENA_IMAGE(o) (NR_CHECK_INSTANCE_TYPE ((o), NR_TYPE_ARENA_IMAGE)) -#include #include "nr-arena-item.h" #include "style.h" diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp index 8e66e13be..04b814cfb 100644 --- a/src/display/nr-arena-item.cpp +++ b/src/display/nr-arena-item.cpp @@ -20,15 +20,12 @@ #include #include -#include -#include #include "nr-arena.h" #include "nr-arena-item.h" #include "gc-core.h" #include "helper/geom.h" #include "nr-filter.h" -#include "libnr/nr-rect.h" #include "nr-arena-group.h" #include "preferences.h" diff --git a/src/display/nr-arena-item.h b/src/display/nr-arena-item.h index 23dd92a43..22c15daef 100644 --- a/src/display/nr-arena-item.h +++ b/src/display/nr-arena-item.h @@ -52,7 +52,7 @@ #define NR_ARENA_ITEM_RENDER_NO_CACHE (1 << 0) -#include +#include <2geom/matrix.h> #include #include #include @@ -60,7 +60,6 @@ #include "nr-arena-forward.h" #include "display/nr-filter.h" #include -#include struct NRGC { NRGC(NRGC const *p) : parent(p) {} -- cgit v1.2.3