merge with dev

This commit is contained in:
Desmis
2018-05-05 09:37:58 +02:00
115 changed files with 1924 additions and 3142 deletions

View File

@@ -472,36 +472,36 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
OUTPUTPROFILE, // EvOBPCompens
ALLNORAW, // EvWBtempBias
DARKFRAME, // EvRawImageNum
DEMOSAIC, // EvPixelShiftMotion
DEMOSAIC, // EvPixelShiftMotionCorrection
DEMOSAIC, // EvPixelShiftStddevFactorGreen
0, // unused
0, // unused
0, // unused
DEMOSAIC, // EvPixelShiftEperIso
DEMOSAIC, // EvPixelShiftNreadIso
DEMOSAIC, // EvPixelShiftPrnu
0, // unused
0, // unused
DEMOSAIC, // EvPixelshiftShowMotion
DEMOSAIC, // EvPixelshiftShowMotionMaskOnly
DEMOSAIC, // EvPixelShiftAutomatic
DEMOSAIC, // EvPixelShiftNonGreenHorizontal
DEMOSAIC, // EvPixelShiftNonGreenVertical
0, // unused
0, // unused
0, // unused
DEMOSAIC, // EvPixelShiftNonGreenCross
DEMOSAIC, // EvPixelShiftStddevFactorRed
DEMOSAIC, // EvPixelShiftStddevFactorBlue
DEMOSAIC, // EvPixelShiftNonGreenCross2
DEMOSAIC, // EvPixelShiftNonGreenAmaze
0, // unused
0, // unused
0, // unused
0, // unused
DEMOSAIC, // EvPixelShiftGreen
DEMOSAIC, // EvPixelShiftRedBlueWeight
0, // unused
DEMOSAIC, // EvPixelShiftBlur
DEMOSAIC, // EvPixelShiftSigma
DEMOSAIC, // EvPixelShiftSum
DEMOSAIC, // EvPixelShiftExp0
0, // unused
0, // unused
DEMOSAIC, // EvPixelShiftHoleFill
DEMOSAIC, // EvPixelShiftMedian
DEMOSAIC, // EvPixelShiftMedian3
0, // unused
DEMOSAIC, // EvPixelShiftMotionMethod
DEMOSAIC, // EvPixelShiftSmooth
DEMOSAIC, // EvPixelShiftLmmse
DEMOSAIC, // EvPixelShiftEqualBright
DEMOSAIC, // EvPixelShiftEqualBrightChannel
DEMOSAIC, // EvPixelShiftEqualBrightChannel
LUMINANCECURVE, // EvCATtempout
LUMINANCECURVE, // EvCATgreenout
LUMINANCECURVE, // EvCATybout
@@ -519,8 +519,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
HDR, // EvTMFattalAmount
ALLNORAW, // EvWBEnabled
RGBCURVE, // EvRGBEnabled
LUMINANCECURVE, // EvLEnabled
DEMOSAIC // EvPixelShiftOneGreen
LUMINANCECURVE // EvLEnabled
};