Fixed icon loading, cacheing and fallback to use stock mechanisms.

[inkscape.git] / src / filter-enums.cpp

diff --git a/src/filter-enums.cpp b/src/filter-enums.cpp
index df494c50c1c80004bcdff5957b915abf40e383de..45a1c4c720ec93e6b58e072eebe6c5eb5fcce44c 100644 (file)
--- a/src/filter-enums.cpp
+++ b/src/filter-enums.cpp
@@ -97,13 +97,13 @@ const EnumData<NR::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeData[NR::
 const EnumDataConverter<NR::FilterConvolveMatrixEdgeMode> ConvolveMatrixEdgeModeConverter(ConvolveMatrixEdgeModeData, NR::CONVOLVEMATRIX_EDGEMODE_ENDTYPE);
 
 // feDisplacementMap
-const EnumData<int> DisplacementMapChannelData[4] = {
-    {0, _("Red"),   "R"},
-    {1, _("Green"), "G"},
-    {2, _("Blue"),  "B"},
-    {3, _("Alpha"), "A"}
+const EnumData<FilterDisplacementMapChannelSelector> DisplacementMapChannelData[DISPLACEMENTMAP_CHANNEL_ENDTYPE] = {
+    {DISPLACEMENTMAP_CHANNEL_RED, _("Red"),   "R"},
+    {DISPLACEMENTMAP_CHANNEL_GREEN, _("Green"), "G"},
+    {DISPLACEMENTMAP_CHANNEL_BLUE, _("Blue"),  "B"},
+    {DISPLACEMENTMAP_CHANNEL_ALPHA, _("Alpha"), "A"}
 };
-const EnumDataConverter<int> DisplacementMapChannelConverter(DisplacementMapChannelData, 4);
+const EnumDataConverter<FilterDisplacementMapChannelSelector> DisplacementMapChannelConverter(DisplacementMapChannelData, DISPLACEMENTMAP_CHANNEL_ENDTYPE);
 
 // feMorphology
 const EnumData<NR::FilterMorphologyOperator> MorphologyOperatorData[NR::MORPHOLOGY_OPERATOR_END] = {