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

Bugfix: WB slider crashed application ( issue #251 )

Browse Source
This commit is contained in:
ffsup2
2011-01-15 22:57:10 +01:00
parent 6e697af423
commit e3957e6c5d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/improcfun.cc
View File

@@ -134,9 +134,8 @@ void ImProcFunctions::setScale (double iscale) {
scale = iscale;
}
void ImProcFunctions::firstAnalysis_ (Image16* original, Glib::ustring wprofile, unsigned int* histogram, int* chroma_radius, int row_from, int row_to) {
void ImProcFunctions::firstAnalysis_ (Image16* original, const TMatrix &wprof, unsigned int* histogram, int* chroma_radius, int row_from, int row_to) {
TMatrix wprof = iccStore->workingSpaceMatrix (wprofile);
int toxyz[3][3];
toxyz[0][0] = round(32768.0 * wprof[0][0] / 0.96422);
toxyz[1][0] = round(32768.0 * wprof[1][0] / 0.96422);
@@ -192,7 +191,7 @@ void ImProcFunctions::firstAnalysis_ (Image16* original, Glib::ustring wprofile,
void ImProcFunctions::firstAnalysis (Image16* original, const ProcParams* params, unsigned int* histogram, double gamma) {
// set up monitor transform
Glib::ustring wprofile = params->icm.working;
TMatrix wprof = iccStore->workingSpaceMatrix (params->icm.working);
if (monitorTransform)
cmsDeleteTransform (monitorTransform);
monitorTransform = NULL;
@@ -232,12 +231,12 @@ void ImProcFunctions::firstAnalysis (Image16* original, const ProcParams* params
int blk = H/nthreads;
if (tid<nthreads-1)
firstAnalysis_ (original, wprofile, hist[tid], &cr[tid], tid*blk, (tid+1)*blk);
firstAnalysis_ (original, wprof, hist[tid], &cr[tid], tid*blk, (tid+1)*blk);
else
firstAnalysis_ (original, wprofile, hist[tid], &cr[tid], tid*blk, H);
firstAnalysis_ (original, wprof, hist[tid], &cr[tid], tid*blk, H);
}
#else
firstAnalysis_ (original, wprofile, hist[0], &cr[0], 0, original->height);
firstAnalysis_ (original, wprof, hist[0], &cr[0], 0, original->height);
#endif
chroma_radius = cr[0];
for (int i=0; i<T; i++)

3
rtengine/improcfun.h
View File

@@ -25,6 +25,7 @@
#include <shmap.h>
#include <coord2d.h>
#include <labimage.h>
#include <iccstore.h>
namespace rtengine {
@@ -54,7 +55,7 @@ class ImProcFunctions {
void transformNonSep (Image16* original, Image16* transformed, int cx, int cy, int sx, int sy, int oW, int oH);
void transformSep (Image16* original, Image16* transformed, int cx, int cy, int sx, int sy, int oW, int oH);
void sharpenHaloCtrl (LabImage* lab, unsigned short** blurmap, unsigned short** base, int W, int H);
void firstAnalysis_ (Image16* original, Glib::ustring wprofile, unsigned int* histogram, int* chroma_radius, int row_from, int row_to);
void firstAnalysis_ (Image16* original, const TMatrix &wprof, unsigned int* histogram, int* chroma_radius, int row_from, int row_to);
void dcdamping (float** aI, unsigned short** aO, float damping, int W, int H);
bool needsCA ();