From 1102ed16d9872bd6ea8eb4c6c147440c10cbd765 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Fri, 5 Dec 2008 21:51:06 +0000 Subject: [PATCH] 2geom more as fix --- src/display/nr-filter-colormatrix.cpp | 2 +- src/display/nr-filter-colormatrix.h | 2 +- src/display/nr-filter-component-transfer.cpp | 2 +- src/display/nr-filter-component-transfer.h | 2 +- src/display/nr-filter-convolve-matrix.cpp | 2 +- src/display/nr-filter-convolve-matrix.h | 2 +- src/display/nr-filter-displacement-map.cpp | 2 +- src/display/nr-filter-displacement-map.h | 2 +- src/display/nr-filter-flood.cpp | 2 +- src/display/nr-filter-flood.h | 2 +- src/display/nr-filter-morphology.cpp | 2 +- src/display/nr-filter-morphology.h | 2 +- src/display/nr-filter-offset.cpp | 2 +- src/display/nr-filter-offset.h | 2 +- src/display/nr-filter-primitive.cpp | 2 +- src/display/nr-filter-primitive.h | 2 +- src/display/nr-filter-tile.cpp | 2 +- src/display/nr-filter-tile.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp index 1d73f14e1..10181a16e 100644 --- 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 d62cb5c19..85d2ab758 100644 --- 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 &values); diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp index f4749de82..4004d6e8d 100644 --- 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 ae08d6f29..3a7c015cb 100644 --- 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 tableValues[4]; diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp index e23a8b32f..e29283cf1 100644 --- 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 b13db2f98..d21ec0386 100644 --- 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 f4c29989f..be6f34716 100644 --- 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 6730822d9..e15f955dd 100644 --- 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 ef95b87e5..8e9b51039 100644 --- 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 6f7779a73..cd9269913 100644 --- 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 7850849f3..9ddac5cb3 100644 --- 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 c930c5e0a..b598a4208 100644 --- 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 683c4f83d..748c69f46 100644 --- 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 ffcdbd744..871b5ee0a 100644 --- 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 32467e3de..eb4583b6e 100644 --- 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 fba4c6344..0d898f976 100644 --- 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 565bc8c7e..7fa8ac06c 100644 --- 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 45d280d39..ce302863c 100644 --- 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(); }; -- 2.30.2