summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/nr-filter-displacement-map.cpp4
-rw-r--r--src/display/nr-filter-displacement-map.h7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 838db0fdf..5d454e6cd 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -115,8 +115,8 @@ void FilterDisplacementMap::set_input(int input, int slot) {
if (input == 1) _input2 = slot;
}
-void FilterDisplacementMap::set_channel_selector(int s, int channel) {
- if (channel>3 || channel <0) {
+void FilterDisplacementMap::set_channel_selector(int s, FilterDisplacementMapChannelSelector channel) {
+ if (channel > DISPLACEMENTMAP_CHANNEL_ALPHA || channel < DISPLACEMENTMAP_CHANNEL_RED) {
g_warning("Selected an invalid channel value. (%d)", channel);
return;
}
diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index b89553697..34ba3aad2 100644
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -12,6 +12,7 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include "sp-fedisplacementmap.h"
#include "display/nr-filter-primitive.h"
#include "display/nr-filter-slot.h"
#include "display/nr-filter-units.h"
@@ -29,7 +30,7 @@ public:
virtual void set_input(int slot);
virtual void set_input(int input, int slot);
virtual void set_scale(double s);
- virtual void set_channel_selector(int channel, int 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 FilterTraits get_input_traits();
@@ -37,8 +38,8 @@ public:
private:
double scale;
int _input2;
- int Xchannel;
- int Ychannel;
+ FilterDisplacementMapChannelSelector Xchannel;
+ FilterDisplacementMapChannelSelector Ychannel;
int out_x0, out_y0, out_w, out_h;
};