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

Bugfix for inverse gamma in tonecurve.

Browse Source
This commit is contained in:
Emil Martinec
2011-02-13 16:26:00 -06:00
parent e037c4616f
commit ed39938e55
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/curves.cc
View File

@@ -404,7 +404,7 @@ void CurveFactory::complexsgnCurve (double saturation, bool satlimit, double sat
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
void CurveFactory::complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh, \ void CurveFactory::complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh, \
double shcompr, double br, double contr, double defmul, double gamma_, bool igamma, \ double shcompr, double br, double contr, double defmul, double gamma_, bool igamma_, \
const std::vector<double>& curvePoints, unsigned int* histogram, \ const std::vector<double>& curvePoints, unsigned int* histogram, \
float* hlCurve, float* shCurve, int* outCurve, \ float* hlCurve, float* shCurve, int* outCurve, \
unsigned int* outBeforeCCurveHistogram, int skip) { unsigned int* outBeforeCCurveHistogram, int skip) {
@@ -429,7 +429,7 @@ void CurveFactory::complexsgnCurve (double saturation, bool satlimit, double sat
bool needcontrast = contr>0.00001 || contr<-0.00001; bool needcontrast = contr>0.00001 || contr<-0.00001;
// check if inverse gamma is needed at the end // check if inverse gamma is needed at the end
bool needigamma = igamma && gamma_>0; bool needigamma = igamma_ && gamma_>0;
// create a curve if needed // create a curve if needed
Curve* tcurve = NULL; Curve* tcurve = NULL;
@@ -590,7 +590,7 @@ void CurveFactory::complexsgnCurve (double saturation, bool satlimit, double sat
// if inverse gamma is needed, do it (standard sRGB inverse gamma is applied) // if inverse gamma is needed, do it (standard sRGB inverse gamma is applied)
if (needigamma) if (needigamma)
val = igamma2 (val); val = igamma (val, gamma_, start, slope, mul, add);
outCurve[i] = (int) (65535.0 * val + 0.5); outCurve[i] = (int) (65535.0 * val + 0.5);
} }

6
rtengine/curves.h
View File

@@ -148,6 +148,10 @@ class CurveFactory {
static inline double gamma (double x, double gamma, double start, double slope, double mul, double add){ static inline double gamma (double x, double gamma, double start, double slope, double mul, double add){
return (x <= start ? x*slope : exp(log(x)/gamma)*mul-add); return (x <= start ? x*slope : exp(log(x)/gamma)*mul-add);
} }
static inline double igamma (double x, double gamma, double start, double slope, double mul, double add){
return (x <= start*slope ? x/slope : exp(log((x+add)/mul)*gamma) );
}
// gamma functions on [0,65535] based on look-up tables // gamma functions on [0,65535] based on look-up tables
static inline int gamma_srgb (int x) { return gammatab_srgb[x]; } static inline int gamma_srgb (int x) { return gammatab_srgb[x]; }
@@ -156,7 +160,7 @@ class CurveFactory {
public: public:
// static void updateCurve3 (int* curve, int* ohistogram, const std::vector<double>& cpoints, double defmul, double ecomp, int black, double hlcompr, double shcompr, double br, double contr, double gamma_, bool igamma, int skip=1); // static void updateCurve3 (int* curve, int* ohistogram, const std::vector<double>& cpoints, double defmul, double ecomp, int black, double hlcompr, double shcompr, double br, double contr, double gamma_, bool igamma, int skip=1);
static void complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh, double shcompr, double br, double contr, double defmul, double gamma_, bool igamma, const std::vector<double>& curvePoints, unsigned int* histogram, float* hlCurve, float* shCurve, int* outCurve, unsigned int* outBeforeCCurveHistogram, int skip=1); static void complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh, double shcompr, double br, double contr, double defmul, double gamma_, bool igamma_, const std::vector<double>& curvePoints, unsigned int* histogram, float* hlCurve, float* shCurve, int* outCurve, unsigned int* outBeforeCCurveHistogram, int skip=1);
static void complexsgnCurve (double saturation, bool satlimit, double satlimthresh, const std::vector<double>& curvePoints, float* outCurve, int skip=1); static void complexsgnCurve (double saturation, bool satlimit, double satlimthresh, const std::vector<double>& curvePoints, float* outCurve, int skip=1);
}; };