liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev..

Browse Source
This commit is contained in:
Desmis
2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rtengine/procparams.h
View File

@@ -1363,18 +1363,19 @@ struct RAWParams {
struct BayerSensor {
enum class Method {
AMAZE,
IGV,
AMAZEVNG4,
RCD,
DCB,
LMMSE,
IGV,
AHD,
EAHD,
HPHD,
VNG4,
DCB,
AHD,
RCD,
FAST,
MONO,
NONE,
PIXELSHIFT
PIXELSHIFT,
NONE
};
enum class PSMotionCorrectionMethod {
@@ -1383,6 +1384,12 @@ struct RAWParams {
CUSTOM
};
enum class PSDemosaicMethod {
AMAZE,
AMAZEVNG4,
LMMSE
};
Glib::ustring method;
int imageNum;
int ccSteps;
@@ -1402,6 +1409,7 @@ struct RAWParams {
int greenthresh;
int dcb_iterations;
int lmmse_iterations;
double dualDemosaicContrast;
PSMotionCorrectionMethod pixelShiftMotionCorrectionMethod;
double pixelShiftEperIso;
double pixelShiftSigma;
@@ -1412,10 +1420,10 @@ struct RAWParams {
bool pixelShiftGreen;
bool pixelShiftBlur;
double pixelShiftSmoothFactor;
bool pixelShiftLmmse;
bool pixelShiftEqualBright;
bool pixelShiftEqualBrightChannel;
bool pixelShiftNonGreenCross;
Glib::ustring pixelShiftDemosaicMethod;
bool dcb_enhance;
bool pdafLinesFilter;
@@ -1428,6 +1436,9 @@ struct RAWParams {
static const std::vector<const char*>& getMethodStrings();
static Glib::ustring getMethodString(Method method);
static const std::vector<const char*>& getPSDemosaicMethodStrings();
static Glib::ustring getPSDemosaicMethodString(PSDemosaicMethod method);
};
/**
@@ -1435,6 +1446,7 @@ struct RAWParams {
*/
struct XTransSensor {
enum class Method {
FOUR_PASS,
THREE_PASS,
ONE_PASS,
FAST,
@@ -1443,6 +1455,7 @@ struct RAWParams {
};
Glib::ustring method;
double dualDemosaicContrast;
int ccSteps;
double blackred;
double blackgreen;