merge with dev

rtengine/refreshmap.cc

@@ -520,7 +520,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     ALLNORAW,         // EvWBEnabled
     RGBCURVE,         // EvRGBEnabled
     LUMINANCECURVE,    // EvLEnabled
-    LUMINANCECURVE,   // EvlocallablocY
+    DEMOSAIC,          // EvPixelShiftOneGreen
     LUMINANCECURVE,   // EvlocallablocX
     LUMINANCECURVE,   // EvlocallabCenter
     LUMINANCECURVE,   // EvlocallabDegree
@@ -623,6 +623,49 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     LUMINANCECURVE,    // Evlocallabnoisechrodetail
     LUMINANCECURVE,    // Evlocallabsensiden
     LUMINANCECURVE,    // Evlocallabhuerefblur
-    LUMINANCECURVE   // EvlocallabEnabled
+    LUMINANCECURVE,   // EvlocallabEnabled
+    LUMINANCECURVE   // EvlocallablocY
 };
 
+
+namespace rtengine {
+
+RefreshMapper::RefreshMapper():
+    next_event_(rtengine::NUMOFEVENTS)
+{
+    for (int event = 0; event < rtengine::NUMOFEVENTS; ++event) {
+        actions_[event] = refreshmap[event];
+    }
+}
+
+
+ProcEvent RefreshMapper::newEvent()
+{
+    return ProcEvent(++next_event_);
+}
+
+
+void RefreshMapper::mapEvent(ProcEvent event, int action)
+{
+    actions_[event] = action;
+}
+
+
+int RefreshMapper::getAction(ProcEvent event) const
+{
+    auto it = actions_.find(event);
+    if (it == actions_.end()) {
+        return 0;
+    } else {
+        return it->second;
+    }
+}
+
+
+RefreshMapper *RefreshMapper::getInstance()
+{
+    static RefreshMapper instance;
+    return &instance;
+}
+
+} // namespace rtengine