merge with dev
This commit is contained in:
@@ -747,7 +747,6 @@ struct FattalToneMappingParams {
|
||||
*/
|
||||
struct SHParams {
|
||||
bool enabled;
|
||||
bool hq;
|
||||
int highlights;
|
||||
int htonalwidth;
|
||||
int shadows;
|
||||
@@ -1376,15 +1375,6 @@ struct RAWParams {
|
||||
PIXELSHIFT
|
||||
};
|
||||
|
||||
enum class PSMotionCorrection {
|
||||
GRID_1X1,
|
||||
GRID_1X2,
|
||||
GRID_3X3,
|
||||
GRID_5X5,
|
||||
GRID_7X7,
|
||||
GRID_3X3_NEW
|
||||
};
|
||||
|
||||
enum class PSMotionCorrectionMethod {
|
||||
OFF,
|
||||
AUTO,
|
||||
@@ -1410,37 +1400,20 @@ struct RAWParams {
|
||||
int greenthresh;
|
||||
int dcb_iterations;
|
||||
int lmmse_iterations;
|
||||
int pixelShiftMotion;
|
||||
PSMotionCorrection pixelShiftMotionCorrection;
|
||||
PSMotionCorrectionMethod pixelShiftMotionCorrectionMethod;
|
||||
double pixelShiftStddevFactorGreen;
|
||||
double pixelShiftStddevFactorRed;
|
||||
double pixelShiftStddevFactorBlue;
|
||||
double pixelShiftEperIso;
|
||||
double pixelShiftNreadIso;
|
||||
double pixelShiftPrnu;
|
||||
double pixelShiftSigma;
|
||||
double pixelShiftSum;
|
||||
double pixelShiftRedBlueWeight;
|
||||
bool pixelShiftShowMotion;
|
||||
bool pixelShiftShowMotionMaskOnly;
|
||||
bool pixelShiftAutomatic;
|
||||
bool pixelShiftNonGreenHorizontal;
|
||||
bool pixelShiftNonGreenVertical;
|
||||
bool pixelShiftHoleFill;
|
||||
bool pixelShiftMedian;
|
||||
bool pixelShiftMedian3;
|
||||
bool pixelShiftGreen;
|
||||
bool pixelShiftBlur;
|
||||
double pixelShiftSmoothFactor;
|
||||
bool pixelShiftExp0;
|
||||
bool pixelShiftLmmse;
|
||||
bool pixelShiftOneGreen;
|
||||
bool pixelShiftEqualBright;
|
||||
bool pixelShiftEqualBrightChannel;
|
||||
bool pixelShiftNonGreenCross;
|
||||
bool pixelShiftNonGreenCross2;
|
||||
bool pixelShiftNonGreenAmaze;
|
||||
bool dcb_enhance;
|
||||
bool pdafLinesFilter;
|
||||
|
||||
|
Reference in New Issue
Block a user