Merge branch 'dev' into spot-removal-tool

rtengine/procevents.h

@@ -73,7 +73,7 @@ enum ProcEvent {
     EvLDNRadius = 43, // obsolete
     EvLDNEdgeTolerance = 44, // obsolete
     EvCDNEnabled = 45, // obsolete
-    EvBlendCMSMatrix = 46,
+    EvBlendCMSMatrix = 46, // obsolete
     EvDCPToneCurve = 47,
     EvDCPIlluminant = 48,
     EvSHEnabled = 49,
@@ -451,7 +451,7 @@ enum ProcEvent {
     EvLgam = 421,
     EvLslope = 422,
     EvLhighl = 423,
-    EvLbaselog = 424,
+    EvSpotEnabled = 424,
     EvRetinexlhcurve = 425,
     EvOIntent = 426,
     EvMonitorTransform = 427,
@@ -470,7 +470,48 @@ enum ProcEvent {
     EvRetinexgaintransmission = 440,
     EvLskal = 441,
     EvOBPCompens = 442,
-    EvSpotEnabled = 443,
+    EvWBtempBias = 443,
+    EvRawImageNum = 444,
+    EvPixelShiftMotion = 445,
+    EvPixelShiftMotionCorrection = 446,
+    EvPixelShiftStddevFactorGreen = 447,
+    EvPixelShiftEperIso = 448,
+    EvPixelShiftNreadIso = 449,
+    EvPixelShiftPrnu = 450,
+    EvPixelshiftShowMotion = 451,
+    EvPixelshiftShowMotionMaskOnly = 452,
+    EvPixelShiftAutomatic = 453,
+    EvPixelShiftNonGreenHorizontal = 454,
+    EvPixelShiftNonGreenVertical = 455,
+    EvPixelShiftNonGreenCross = 456,
+    EvPixelShiftStddevFactorRed = 457,
+    EvPixelShiftStddevFactorBlue = 458,
+    EvPixelShiftGreenAmaze = 459,
+    EvPixelShiftNonGreenAmaze = 460,
+    EvPixelShiftGreen = 461,
+    EvPixelShiftRedBlueWeight = 462,
+    EvPixelShiftBlur = 463,
+    EvPixelShiftSigma = 464,
+    EvPixelShiftSum = 465,
+    EvPixelShiftExp0 = 466,
+    EvPixelShiftHoleFill = 467,
+    EvPixelShiftMedian = 468,
+    EvPixelShiftMedian3 = 469,
+    EvPixelShiftMotionMethod = 470,
+    EvPixelShiftSmooth = 471,
+    EvPixelShiftLmmse = 472,
+    EvPixelShiftEqualBright = 473,
+    EvPixelShiftEqualBrightChannel = 474,
+    EvCATtempout = 475,
+    EvCATgreenout = 476,
+    EvCATybout = 477,
+    EvCATDegreeout = 478,
+    EvCATAutoDegreeout = 479,
+    EvCATtempsc = 480,
+    EvCATgreensc = 481,
+    EvCATybscen = 482,
+    EvCATAutoyb = 483,
+
     NUMOFEVENTS
 
 };