Merged master into rgbcurvesspeedup.

This commit is contained in:
Beep6581
2016-06-02 22:33:34 +02:00
81 changed files with 3557 additions and 2018 deletions

View File

@@ -41,6 +41,7 @@ class WavOpacityCurveBY;
class WavOpacityCurveW;
class WavOpacityCurveWL;
class RetinextransmissionCurve;
class RetinexgaintransmissionCurve;
enum RenderingIntent {
RI_PERCEPTUAL = INTENT_PERCEPTUAL,
@@ -282,6 +283,7 @@ public:
std::vector<double> cdHcurve;
std::vector<double> lhcurve;
std::vector<double> transmissionCurve;
std::vector<double> gaintransmissionCurve;
std::vector<double> mapcurve;
int str;
int scal;
@@ -308,11 +310,13 @@ public:
int limd;
int highl;
double baselog;
// int grbl;
int skal;
bool medianmap;
RetinexParams ();
void setDefaults();
void getCurves(RetinextransmissionCurve &transmissionCurveLUT) const;
void getCurves(RetinextransmissionCurve &transmissionCurveLUT, RetinexgaintransmissionCurve &gaintransmissionCurveLUT) const;
static void getDefaultgaintransmissionCurve(std::vector<double> &curve);
static void getDefaulttransmissionCurve(std::vector<double> &curve);
};