diff options
| author | Felipe Corr??a da Silva Sanches <juca@members.fsf.org> | 2008-02-19 20:57:06 +0000 |
|---|---|---|
| committer | jucablues <jucablues@users.sourceforge.net> | 2008-02-19 20:57:06 +0000 |
| commit | 3a44b1daa97af92fa1be4f7199641ae003065532 (patch) | |
| tree | 15518ba471a241da224fbe45189626630c0ec5e9 /src/display | |
| parent | r18035@shi: ted | 2008-02-19 12:54:20 -0800 (diff) | |
| download | inkscape-3a44b1daa97af92fa1be4f7199641ae003065532.tar.gz inkscape-3a44b1daa97af92fa1be4f7199641ae003065532.zip | |
* use enums to deal with displacementmap channel selectors
* set default values explicitly for all combobox filter settings at the filters dialog.
(bzr r4781)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-filter-displacement-map.cpp | 4 | ||||
| -rw-r--r-- | src/display/nr-filter-displacement-map.h | 7 |
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; }; |