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

Fixing bug in ComplexCurve.

Browse Source
This commit is contained in:
Emil Martinec 2011-01-08 16:57:36 -06:00
parent 0f8bb7322c
commit 15517c0c5d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/curves.cc
View File

@ -24,8 +24,8 @@
#include <mytime.h> #include <mytime.h>
#include <string.h> #include <string.h>
#undef CLIPD
#define CLIPD(a) ((a)>0.0?((a)<1.0?(a):1.0):0.0) #define CLIPD(a) ((a)>0.0?((a)<1.0?(a):1.0):0.0)
#define CLIP(a) ((a)<65535 ? (a) : (65535))
namespace rtengine { namespace rtengine {
@ -537,7 +537,7 @@ double CurveFactory::centercontrast (double x, double b, double m) {
double avg = 0; double avg = 0;
//double sqavg = 0; //double sqavg = 0;
for (int i=0; i<=0xffff; i++) { for (int i=0; i<=0xffff; i++) {
avg += dcurve[(int)shCurve[(int)hlCurve[i]*i]] * histogram[i]; avg += dcurve[(int)shCurve[CLIP((int)hlCurve[i]*i)]] * histogram[i];
//sqavg += dcurve[i]*dcurve[i] * histogram[i]; //sqavg += dcurve[i]*dcurve[i] * histogram[i];
sum += histogram[i]; sum += histogram[i];
} }

2
rtengine/dcrop.cc
View File

@ -21,7 +21,7 @@
#include <mytime.h> #include <mytime.h>
#include <refreshmap.h> #include <refreshmap.h>
#define CLIPTO(a,b,c) ((a)>b?((a)<c?(a):c):b) #define CLIPTO(a,b,c) ((a)>b?((a)<c?(a):c):b)
#define CLIP(a) ((a)<65535 ? (a) : (65535)); #define CLIP(a) ((a)<65535 ? (a) : (65535))
#define SKIPS(a,b) ((a) / (b) + ((a) % (b) > 0)) #define SKIPS(a,b) ((a) / (b) + ((a) % (b) > 0))
namespace rtengine { namespace rtengine {