From 55693f88f4b1215fe3938e01d90fd19e99bc7b59 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Tue, 30 Dec 2008 23:10:51 +0000 Subject: [PATCH] get rid of a lot of no longer needed "libnr/nr-..." includes. --- src/display/canvas-bpath.cpp | 1 - src/display/nr-arena-shape.cpp | 2 -- src/display/nr-filter-blend.cpp | 1 - src/display/nr-filter-blend.h | 1 - src/display/nr-filter-composite.cpp | 1 - src/display/nr-filter-composite.h | 1 - src/display/nr-filter-convolve-matrix.h | 1 - src/display/nr-filter-diffuselighting.cpp | 1 - src/display/nr-filter-diffuselighting.h | 1 - src/display/nr-filter-displacement-map.cpp | 1 - src/display/nr-filter-displacement-map.h | 1 - src/display/nr-filter-image.cpp | 1 - src/display/nr-filter-merge.cpp | 1 - src/display/nr-filter-merge.h | 1 - src/display/nr-filter-morphology.cpp | 12 +++++------- src/display/nr-filter-offset.cpp | 3 --- src/display/nr-filter-offset.h | 1 - src/display/nr-filter-primitive.h | 1 - src/display/nr-filter-skeleton.cpp | 1 - src/display/nr-filter-skeleton.h | 1 - src/display/nr-filter-specularlighting.cpp | 1 - src/display/nr-filter-specularlighting.h | 1 - src/display/nr-filter-tile.h | 1 - src/display/nr-filter-units.h | 1 + 24 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp index aa4b40e17..b0ada1e68 100644 --- a/src/display/canvas-bpath.cpp +++ b/src/display/canvas-bpath.cpp @@ -47,7 +47,6 @@ #endif #include -#include #include **/ diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index e47907826..906d9166c 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -19,8 +19,6 @@ #include #include "display/curve.h" #include -#include -#include #include #include #include <2geom/pathvector.h> diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp index fe21dc125..2544d8bfb 100644 --- a/src/display/nr-filter-blend.cpp +++ b/src/display/nr-filter-blend.cpp @@ -21,7 +21,6 @@ #include "display/nr-filter-types.h" #include "display/nr-filter-units.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-blit.h" #include "libnr/nr-pixops.h" diff --git a/src/display/nr-filter-blend.h b/src/display/nr-filter-blend.h index 28f92dad4..3e3bf71b2 100644 --- a/src/display/nr-filter-blend.h +++ b/src/display/nr-filter-blend.h @@ -20,7 +20,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" namespace NR { diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp index 32fa3e2a5..568c093b9 100644 --- a/src/display/nr-filter-composite.cpp +++ b/src/display/nr-filter-composite.cpp @@ -21,7 +21,6 @@ #include "libnr/nr-blit.h" #include "libnr/nr-pixblock.h" #include "libnr/nr-pixops.h" -#include "libnr/nr-matrix.h" inline void composite_over(unsigned char *r, unsigned char const *a, unsigned char const *b) diff --git a/src/display/nr-filter-composite.h b/src/display/nr-filter-composite.h index 72331f767..d467213f0 100644 --- a/src/display/nr-filter-composite.h +++ b/src/display/nr-filter-composite.h @@ -16,7 +16,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" namespace NR { diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/nr-filter-convolve-matrix.h index d21ec0386..8414b60c1 100644 --- a/src/display/nr-filter-convolve-matrix.h +++ b/src/display/nr-filter-convolve-matrix.h @@ -15,7 +15,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" #include diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp index 32896712c..77879cd89 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -22,7 +22,6 @@ #include "display/nr-light.h" #include "libnr/nr-blit.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" #include "color.h" diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index b3b574f0c..36ed8835b 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -18,7 +18,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "filters/distantlight.h" #include "filters/pointlight.h" #include "filters/spotlight.h" diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp index be6f34716..928745f31 100644 --- a/src/display/nr-filter-displacement-map.cpp +++ b/src/display/nr-filter-displacement-map.cpp @@ -13,7 +13,6 @@ #include "display/nr-filter-types.h" #include "display/nr-filter-units.h" #include "libnr/nr-blit.h" -#include "libnr/nr-matrix-fns.h" #include "libnr/nr-pixops.h" namespace NR { diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h index e15f955dd..f30c5a8a9 100644 --- a/src/display/nr-filter-displacement-map.h +++ b/src/display/nr-filter-displacement-map.h @@ -16,7 +16,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" namespace NR { diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp index 978ecc6af..da8fe0ac4 100644 --- a/src/display/nr-filter-image.cpp +++ b/src/display/nr-filter-image.cpp @@ -16,7 +16,6 @@ #include "display/nr-filter.h" #include "display/nr-filter-image.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" namespace NR { diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp index 4581238b7..380884223 100644 --- a/src/display/nr-filter-merge.cpp +++ b/src/display/nr-filter-merge.cpp @@ -22,7 +22,6 @@ #include "libnr/nr-blit.h" #include "libnr/nr-pixblock.h" #include "libnr/nr-pixops.h" -#include "libnr/nr-matrix.h" inline void composite_over(unsigned char *r, unsigned char const *a, unsigned char const *b) diff --git a/src/display/nr-filter-merge.h b/src/display/nr-filter-merge.h index 3fa62a9cc..14c16a27a 100644 --- a/src/display/nr-filter-merge.h +++ b/src/display/nr-filter-merge.h @@ -18,7 +18,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" namespace NR { diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp index 9ddac5cb3..b1c790442 100644 --- a/src/display/nr-filter-morphology.cpp +++ b/src/display/nr-filter-morphology.cpp @@ -12,8 +12,6 @@ #include "display/nr-filter-morphology.h" #include "display/nr-filter-units.h" #include "libnr/nr-blit.h" -#include "libnr/nr-matrix.h" -#include "libnr/nr-matrix-fns.h" namespace NR { @@ -51,9 +49,9 @@ int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) { free_in_on_exit = true; } - Matrix p2pb = units.get_matrix_primitiveunits2pb(); - int const xradius = (int)round(this->xradius * expansionX(p2pb)); - int const yradius = (int)round(this->yradius * expansionY(p2pb)); + Geom::Matrix p2pb = units.get_matrix_primitiveunits2pb(); + int const xradius = (int)round(this->xradius * p2pb.expansionX()); + int const yradius = (int)round(this->yradius * p2pb.expansionY()); int x0=in->area.x0; int y0=in->area.y0; @@ -114,8 +112,8 @@ int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) { void FilterMorphology::area_enlarge(NRRectL &area, Geom::Matrix const &trans) { - int const enlarge_x = (int)round(this->xradius * expansionX(trans)); - int const enlarge_y = (int)round(this->yradius * expansionY(trans)); + int const enlarge_x = (int)round(this->xradius * trans.expansionX()); + int const enlarge_y = (int)round(this->yradius * trans.expansionY()); area.x0 -= enlarge_x; area.x1 += enlarge_x; diff --git a/src/display/nr-filter-offset.cpp b/src/display/nr-filter-offset.cpp index 748c69f46..ecfa40fa2 100644 --- a/src/display/nr-filter-offset.cpp +++ b/src/display/nr-filter-offset.cpp @@ -13,10 +13,7 @@ #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" #include "libnr/nr-blit.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-point.h" -#include "libnr/nr-point-matrix-ops.h" #include "libnr/nr-rect-l.h" namespace NR { diff --git a/src/display/nr-filter-offset.h b/src/display/nr-filter-offset.h index 871b5ee0a..166fba247 100644 --- a/src/display/nr-filter-offset.h +++ b/src/display/nr-filter-offset.h @@ -15,7 +15,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" namespace NR { diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h index 0d898f976..6d0f5433b 100644 --- a/src/display/nr-filter-primitive.h +++ b/src/display/nr-filter-primitive.h @@ -14,7 +14,6 @@ #include "display/nr-filter-slot.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" #include "svg/svg-length.h" diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/nr-filter-skeleton.cpp index d45f6e916..384baa2c5 100644 --- a/src/display/nr-filter-skeleton.cpp +++ b/src/display/nr-filter-skeleton.cpp @@ -25,7 +25,6 @@ #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" namespace NR { diff --git a/src/display/nr-filter-skeleton.h b/src/display/nr-filter-skeleton.h index b0581593b..c2e595f9c 100644 --- a/src/display/nr-filter-skeleton.h +++ b/src/display/nr-filter-skeleton.h @@ -27,7 +27,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" namespace NR { diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index 3a14eb78f..c6c81700c 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -23,7 +23,6 @@ #include "display/nr-light.h" #include "libnr/nr-blit.h" #include "libnr/nr-pixblock.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" #include "color.h" diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index 4d0bea8ff..38f2dfc22 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -18,7 +18,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "filters/distantlight.h" #include "filters/pointlight.h" #include "filters/spotlight.h" diff --git a/src/display/nr-filter-tile.h b/src/display/nr-filter-tile.h index ce302863c..ecdae91f4 100644 --- a/src/display/nr-filter-tile.h +++ b/src/display/nr-filter-tile.h @@ -15,7 +15,6 @@ #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -#include "libnr/nr-matrix.h" #include "libnr/nr-rect-l.h" namespace NR { diff --git a/src/display/nr-filter-units.h b/src/display/nr-filter-units.h index df38c2bb9..a24e0682f 100644 --- a/src/display/nr-filter-units.h +++ b/src/display/nr-filter-units.h @@ -14,6 +14,7 @@ #include "sp-filter-units.h" #include "libnr/nr-matrix.h" +#include <2geom/matrix.h> #include "libnr/nr-rect.h" #include "libnr/nr-rect-l.h" #include <2geom/rect.h> -- 2.30.2