2geom more as fix

diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 1d73f14e1906ec92ff560d18bba0d8fec95cdc8a..10181a16e50e9b16dc6f69d1e759d44a44b30118 100644 (file)
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -156,7 +156,7 @@ int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &/*units*/) {
     return 0;
 }
 
-void FilterColorMatrix::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
+void FilterColorMatrix::area_enlarge(NRRectL &/*area*/, Geom::Matrix const &/*trans*/)
 {
 }
 

diff --git a/src/display/nr-filter-colormatrix.h b/src/display/nr-filter-colormatrix.h
index d62cb5c193cd9546ebe239ab7895fda5ab6c0716..85d2ab75890ef56e1d92efaa9e0bbb909d1ebc3d 100644 (file)
--- a/src/display/nr-filter-colormatrix.h
+++ b/src/display/nr-filter-colormatrix.h
@@ -34,7 +34,7 @@ public:
     virtual ~FilterColorMatrix();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual void set_type(FilterColorMatrixType type);
     virtual void set_value(gdouble value);
     virtual void set_values(std::vector<gdouble> &values);

diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index f4749de825f25b9a05c91c3ad0190c070f8174a7..4004d6e8d1373a7c761c1ef38d8ed1d49e994aa6 100644 (file)
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -132,7 +132,7 @@ int FilterComponentTransfer::render(FilterSlot &slot, FilterUnits const &/*units
     return 0;
 }
 
-void FilterComponentTransfer::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
+void FilterComponentTransfer::area_enlarge(NRRectL &/*area*/, Geom::Matrix const &/*trans*/)
 {
 }
 

diff --git a/src/display/nr-filter-component-transfer.h b/src/display/nr-filter-component-transfer.h
index ae08d6f290c60e55a8f13f3622731b1389694db8..3a7c015cb0bd5b60418a49bd26b6dfafbf60d7ed 100644 (file)
--- a/src/display/nr-filter-component-transfer.h
+++ b/src/display/nr-filter-component-transfer.h
@@ -35,7 +35,7 @@ public:
     virtual ~FilterComponentTransfer();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
 
     FilterComponentTransferType type[4];
     std::vector<gdouble> tableValues[4];

diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index e23a8b32f8a34621328e88ae14f2a7206aa5e5ff..e29283cf1b7fe4a1efd117772966c1ccd515cda1 100644 (file)
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -130,7 +130,7 @@ void FilterConvolveMatrix::set_preserveAlpha(bool pa){
     preserveAlpha = pa;
 }
 
-void FilterConvolveMatrix::area_enlarge(NRRectL &area, Matrix const &/*trans*/)
+void FilterConvolveMatrix::area_enlarge(NRRectL &area, Geom::Matrix const &/*trans*/)
 {
     //Seems to me that since this filter's operation is resolution dependent,
     // some spurious pixels may still appear at the borders when low zooming or rotating. Needs a better fix.

diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/nr-filter-convolve-matrix.h
index b13db2f983d3b9180b3c3d177dd87110619b6a24..d21ec03864e61755ea9efebf6d2a0d55a879fb7c 100644 (file)
--- a/src/display/nr-filter-convolve-matrix.h
+++ b/src/display/nr-filter-convolve-matrix.h
@@ -35,7 +35,7 @@ public:
     virtual ~FilterConvolveMatrix();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual FilterTraits get_input_traits();
 
     void set_targetY(int coord);

diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index f4c29989fed1bf15fc66a725eef5236ccae353dd..be6f347168d1c2647d9ff913bcd39b04e2f78014 100644 (file)
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -141,7 +141,7 @@ void FilterDisplacementMap::set_channel_selector(int s, FilterDisplacementMapCha
     if (s == 1) Ychannel = channel;
 }
 
-void FilterDisplacementMap::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterDisplacementMap::area_enlarge(NRRectL &area, Geom::Matrix const &trans)
 {
     //I assume scale is in user coordinates (?!?)
     //FIXME: trans should be multiplied by some primitiveunits2user, shouldn't it?

diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index 6730822d9905918dae181fbfae1a688b541f7746..e15f955dd007d3da8027ae8fdc38aa91afb18ad2 100644 (file)
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -32,7 +32,7 @@ public:
     virtual void set_scale(double s);
     virtual void set_channel_selector(int s, FilterDisplacementMapChannelSelector channel);
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual FilterTraits get_input_traits();
 
 private:

diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index ef95b87e5fe2eb425a5fcacc234804dfc10f719f..8e9b510398db0e42bb294886a1552bfd4d7e3e69 100644 (file)
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -69,7 +69,7 @@ void FilterFlood::set_opacity(double o) {
     opacity = o;
 }
 
-void FilterFlood::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
+void FilterFlood::area_enlarge(NRRectL &/*area*/, Geom::Matrix const &/*trans*/)
 {
 }
 

diff --git a/src/display/nr-filter-flood.h b/src/display/nr-filter-flood.h
index 6f7779a73186ddc43e0e63c5f81969d53ef7d9d0..cd9269913527f3eac43e654849a289a13c33afcd 100644 (file)
--- a/src/display/nr-filter-flood.h
+++ b/src/display/nr-filter-flood.h
@@ -27,7 +27,7 @@ public:
     virtual void set_opacity(double o);
     virtual void set_color(guint32 c);
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
 private:
     double opacity;
     guint32 color;

diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index 7850849f3b5ba2c0768271de40ddfac6d6ef1556..9ddac5cb30c7c44f4470af19c800264dd970d223 100644 (file)
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -112,7 +112,7 @@ int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) {
     return 0;
 }
 
-void FilterMorphology::area_enlarge(NRRectL &area, Matrix const &trans)
+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));

diff --git a/src/display/nr-filter-morphology.h b/src/display/nr-filter-morphology.h
index c930c5e0a5648fde1ecbb6d04f1f30e5843deac3..b598a4208a6bc708f77c8f411fad71860df107ac 100644 (file)
--- a/src/display/nr-filter-morphology.h
+++ b/src/display/nr-filter-morphology.h
@@ -31,7 +31,7 @@ public:
     virtual ~FilterMorphology();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual FilterTraits get_input_traits();
     void set_operator(FilterMorphologyOperator &o);
     void set_xradius(double x);

diff --git a/src/display/nr-filter-offset.cpp b/src/display/nr-filter-offset.cpp
index 683c4f83d45fe859bf13c04a16dd19f9ea7f0c9f..748c69f463885cd85181f82dcf733a9feec07fea 100644 (file)
--- a/src/display/nr-filter-offset.cpp
+++ b/src/display/nr-filter-offset.cpp
@@ -73,7 +73,7 @@ void FilterOffset::set_dy(double amount) {
     dy = amount;
 }
 
-void FilterOffset::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterOffset::area_enlarge(NRRectL &area, Geom::Matrix const &trans)
 {
     Point offset(dx, dy);
     offset *= trans;

diff --git a/src/display/nr-filter-offset.h b/src/display/nr-filter-offset.h
index ffcdbd744435c4f9e46986da127067d2e9eb5baf..871b5ee0a1dbe1cb0b20d13e911ef3ce1470e283 100644 (file)
--- a/src/display/nr-filter-offset.h
+++ b/src/display/nr-filter-offset.h
@@ -27,7 +27,7 @@ public:
     virtual ~FilterOffset();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
 
     void set_dx(double amount);
     void set_dy(double amount);

diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp
index 32467e3decbe956d151fd5df69b57d30a4f21a63..eb4583b6e7f79e9b1db7a4ed5cb1d206ade26864 100644 (file)
--- a/src/display/nr-filter-primitive.cpp
+++ b/src/display/nr-filter-primitive.cpp
@@ -36,7 +36,7 @@ FilterPrimitive::~FilterPrimitive()
     // Nothing to do here
 }
 
-void FilterPrimitive::area_enlarge(NRRectL &/*area*/, Matrix const &/*m*/)
+void FilterPrimitive::area_enlarge(NRRectL &/*area*/, Geom::Matrix const &/*m*/)
 {
     // This doesn't need to do anything by default
 }

diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index fba4c634419484fc1b83c50a3c277161ce49e357..0d898f976e6e5e3f19c3915c61faf3914a18be52 100644 (file)
--- a/src/display/nr-filter-primitive.h
+++ b/src/display/nr-filter-primitive.h
@@ -44,7 +44,7 @@ public:
     virtual ~FilterPrimitive();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units) = 0;
-    virtual void area_enlarge(NRRectL &area, Matrix const &m);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &m);
 
     /**
      * Sets the input slot number 'slot' to be used as input in rendering

diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index 565bc8c7eca316d6461d0f016831e04f3674c434..7fa8ac06ca267f08dba510d04192a8b27efffdff 100644 (file)
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -52,7 +52,7 @@ int FilterTile::render(FilterSlot &slot, FilterUnits const &/*units*/) {
     return 0;
 }
 
-void FilterTile::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
+void FilterTile::area_enlarge(NRRectL &/*area*/, Geom::Matrix const &/*trans*/)
 {
 }
 

diff --git a/src/display/nr-filter-tile.h b/src/display/nr-filter-tile.h
index 45d280d3957679f15fccce100b72994cad146569..ce302863c67484f358d44d45c78d1cfc85591b41 100644 (file)
--- a/src/display/nr-filter-tile.h
+++ b/src/display/nr-filter-tile.h
@@ -27,7 +27,7 @@ public:
     virtual ~FilterTile();
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
-    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Geom::Matrix const &trans);
     virtual FilterTraits get_input_traits();
 };