Merge from DEFAULT f1e80d00c3099a65283f143268318e504ce6ea85

see comments in issue 1052, comment 439
2012-07-25 21:24:57 -04:00
parent 015d1d8af0 ccae234f7e
commit 00097e8dd2
89 changed files with 6454 additions and 4740 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -56,7 +56,7 @@ SHARPENING,       // EvShrDIterations,
 TRANSFORM,        // EvLCPUseDist,
 DARKFRAME,        // EvLCPUseVign,
 TRANSFORM,        // EvLCPUseCA,
-0,                // EvCBBoost: obsolete
+M_VOID,           // EvFixedExp
 WHITEBALANCE,     // EvWBMethod,
 WHITEBALANCE,     // EvWBTemp,
 WHITEBALANCE,     // EvWBGreen,
@@ -187,7 +187,9 @@ RGBCURVE,         // EvRGBgCurve
 RGBCURVE,         // EvRGBbCurve
 RGBCURVE,         // EvNeutralExp
 LUMINANCECURVE,   // EvLBWtoning
+LUMINANCECURVE,   // EvLCCurve
+LUMINANCECURVE,   // EvLCHGurve
+RGBCURVE,          // EvCCCurve
 ALLNORAW          // EvDPDNLdetail
-	
 };