Merge branch 'master' into spot-removal-tool

2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -453,7 +453,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    RETINEX,          // EvLhighl
    DEMOSAIC,         // EvLbaselog
    DEMOSAIC,         // EvRetinexlhcurve
-    ALLNORAW,         // EvOIntent
+    OUTPUTPROFILE,    // EvOIntent
    MONITORTRANSFORM, // EvMonitorTransform: no history message
    RETINEX,          // EvLiter
    RETINEX,          // EvLgrad
@@ -469,6 +469,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
    ALLNORAW,         // EvcbdlMethod
    RETINEX,          // EvRetinexgaintransmission
    RETINEX,          // EvLskal
+    OUTPUTPROFILE,    // EvOBPCompens
    SPOT              // EvSpotEnabled
 };