Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default

This revision compiles and runs on Win7x64- but further evaluation is necessary.
There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder.
Additional notes:
- ImProcFunctions::hsv2rgb01   -> this likely need to be added to color.h & color.cc
- Use of array2D should be verified in NR code
- compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
michael
2012-07-03 23:15:07 -04:00
parent 78d4f80875
commit 3a4100e710
374 changed files with 47381 additions and 39387 deletions

View File

@@ -60,6 +60,7 @@ class LCurveParamsEdited {
bool lcurve;
bool acurve;
bool bcurve;
bool bwtoning;
};
class RGBCurvesParamsEdited {
@@ -244,10 +245,16 @@ class RotateParamsEdited {
class DistortionParamsEdited {
public:
bool uselensfun;
bool amount;
};
class LensProfParamsEdited {
public:
bool lcpFile,useDist,useVign,useCA;
bool isUnchanged() const;
};
class PerspectiveParamsEdited {
public:
@@ -304,6 +311,7 @@ class ColorManagementParamsEdited {
public:
bool input;
bool blendCMSMatrix;
bool preferredProfile;
bool working;
bool output;
bool gamma;
@@ -386,6 +394,7 @@ class ParamsEdited {
CommonTransformParamsEdited commonTrans;
RotateParamsEdited rotate;
DistortionParamsEdited distortion;
LensProfParamsEdited lensProf;
PerspectiveParamsEdited perspective;
CACorrParamsEdited cacorrection;
VignettingParamsEdited vignetting;