get rid of a lot of no longer needed "libnr/nr-..." includes.

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index aa4b40e175568999ddb07b52a01162792a967752..b0ada1e680535bff353fa782a756edade0fef150 100644 (file)
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -47,7 +47,6 @@
 #endif
 #include <color.h>
 
-#include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-pixops.h>
 **/
 

diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp
index e479078265c86d683f15533c9e7b2ed0cf951cfb..906d9166c9d63edc85cc89807215893c5240d67d 100644 (file)
--- a/src/display/nr-arena-shape.cpp
+++ b/src/display/nr-arena-shape.cpp
@@ -19,8 +19,6 @@
 #include <display/nr-arena-shape.h>
 #include "display/curve.h"
 #include <libnr/nr-pixops.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-blit.h>
 #include <libnr/nr-convert2geom.h>
 #include <2geom/pathvector.h>

diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index fe21dc125ef2de8694300c22bfeb5dab752624a7..2544d8bfb08fe2972801ced5cad731075451fabb 100644 (file)
--- 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 28f92dad47201302e6f9faceb11d3ce15392f419..3e3bf71b2e24d7252a974dcf47fdcd5ef74bf0d9 100644 (file)
--- 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 32fa3e2a5e965c1efad4b3ff48b270109b09db57..568c093b9881e9fea27a8f270e337d90a76881a6 100644 (file)
--- 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 72331f767d63708dbb62d72b0164a22c5b060d22..d467213f088396fe01a46ca7bcab035fd8f7c3fc 100644 (file)
--- 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 d21ec03864e61755ea9efebf6d2a0d55a879fb7c..8414b60c195639611f54d002a73b56d3f2fb84ff 100644 (file)
--- 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 <vector>
 

diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 32896712cb64c206acf5368cbd800957b67d90b8..77879cd8903bc545012712ce4e58598d5fa9f88f 100644 (file)
--- 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 b3b574f0c3f852f1a24fdf2e1d8d642036552578..36ed8835b64211b6870fea19e0b5955c31e82118 100644 (file)
--- 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 be6f347168d1c2647d9ff913bcd39b04e2f78014..928745f31238a964515bcf18645a68e84fb860d0 100644 (file)
--- 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 e15f955dd007d3da8027ae8fdc38aa91afb18ad2..f30c5a8a92f323b4fc9e1aa3d973895440c4360f 100644 (file)
--- 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 978ecc6af950709f1f54fe02a296e9a84ed41218..da8fe0ac42298a8c706b824bb0c193fd726869e7 100644 (file)
--- 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 4581238b7cbd5880329e0b8a0bf37478fdb82094..38088422343494a343b4bd7f4a969e865060d21a 100644 (file)
--- 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 3fa62a9cc8cac02b76624d9e2e38a3b2b5515faf..14c16a27a007fcc93c7c23b897c31a746e85e191 100644 (file)
--- 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 9ddac5cb30c7c44f4470af19c800264dd970d223..b1c79044296a71459142fe82c2d8623452433d47 100644 (file)
--- 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 748c69f463885cd85181f82dcf733a9feec07fea..ecfa40fa290e41c8b638395e197b9765c3fdf360 100644 (file)
--- 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 871b5ee0a1dbe1cb0b20d13e911ef3ce1470e283..166fba247bac1aa86903f9f0b61d1f4752c6d620 100644 (file)
--- 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 0d898f976e6e5e3f19c3915c61faf3914a18be52..6d0f5433b13244bad4918812c3bc45acbf0be7a0 100644 (file)
--- 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 d45f6e916ca5fb4eaddab38329420fae4e0aacac..384baa2c5c0ec4af68a0b7d1e24a1e6e578b7ffe 100644 (file)
--- 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 b0581593b6d00f84a225e3f73aa2578a9067aa48..c2e595f9c65e25b80c03eb6c887e48cf46c07632 100644 (file)
--- 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 3a14eb78f8af798a300b4f498bb91a9e927a8be4..c6c81700cf1977eb8356df4f8d01999c4ff0baaf 100644 (file)
--- 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 4d0bea8fff8efa7cd7dbb061ad15a09c74f9575c..38f2dfc2266da84b2402a63773ab8940bf07fcef 100644 (file)
--- 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 ce302863c67484f358d44d45c78d1cfc85591b41..ecdae91f4c2abf01a9ba1e26c2809bd3a7dd26c7 100644 (file)
--- 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 df38c2bb9837c3c635ae51a181cef4af29c634cc..a24e0682fa957ce0677d634fb183caedcef7a070 100644 (file)
--- 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>