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

Solving issue 1407: "Auto CA Correction in RAW page is not applied when re-open 4.0.9.1"

Browse Source
This commit is contained in:
natureh
2012-07-23 22:50:24 +02:00
parent fd288564a7
commit 5a41f3ef96
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/improccoordinator.cc
View File

@@ -28,7 +28,7 @@ namespace rtengine {
extern const Settings* settings; extern const Settings* settings;
ImProcCoordinator::ImProcCoordinator () ImProcCoordinator::ImProcCoordinator ()
: workimg(NULL), awbComputed(false), ipf(&params, true), scale(10), highDetailComputed(false), allocated(false), : workimg(NULL), awbComputed(false), ipf(&params, true), scale(10), highDetailPreprocessComputed(false), highDetailRawComputed(false), allocated(false),
pW(-1), pH(-1), plistener(NULL), pW(-1), pH(-1), plistener(NULL),
imageListener(NULL), aeListener(NULL), hListener(NULL), resultValid(false), imageListener(NULL), aeListener(NULL), hListener(NULL), resultValid(false),
changeSinceLast(0), updaterRunning(false), destroying(false) { changeSinceLast(0), updaterRunning(false), destroying(false) {
@@ -122,9 +122,14 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
} }
progress ("Applying white balance, color correction & sRGB conversion...",100*readyphase/numofphases); progress ("Applying white balance, color correction & sRGB conversion...",100*readyphase/numofphases);
if ( todo & M_PREPROC) { // raw auto CA is bypassed if no high detail is needed, so we have to compute it when high detail is needed
if ( (todo & M_PREPROC) || (!highDetailPreprocessComputed && highDetailNeeded)) {
imgsrc->preprocess( rp, params.lensProf, params.coarse ); imgsrc->preprocess( rp, params.lensProf, params.coarse );
imgsrc->getRAWHistogram( histRedRaw, histGreenRaw, histBlueRaw ); imgsrc->getRAWHistogram( histRedRaw, histGreenRaw, histBlueRaw );
if (highDetailNeeded)
highDetailPreprocessComputed = true;
else
highDetailPreprocessComputed = false;
} }
/* /*
@@ -139,7 +144,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
*/ */
// If high detail (=100%) is newly selected, do a demosaic update, since the last was just with FAST // If high detail (=100%) is newly selected, do a demosaic update, since the last was just with FAST
if ( (todo & M_RAW) if ( (todo & M_RAW)
|| (!highDetailComputed && highDetailNeeded) || (!highDetailRawComputed && highDetailNeeded)
|| ( params.hlrecovery.enabled && params.hlrecovery.method!="Color" && imgsrc->IsrgbSourceModified()) || ( params.hlrecovery.enabled && params.hlrecovery.method!="Color" && imgsrc->IsrgbSourceModified())
|| (!params.hlrecovery.enabled && params.hlrecovery.method=="Color" && imgsrc->IsrgbSourceModified())) || (!params.hlrecovery.enabled && params.hlrecovery.method=="Color" && imgsrc->IsrgbSourceModified()))
{ {
@@ -147,13 +152,13 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
if (settings->verbose) printf("Demosaic %s\n",rp.dmethod.c_str()); if (settings->verbose) printf("Demosaic %s\n",rp.dmethod.c_str());
imgsrc->demosaic( rp ); imgsrc->demosaic( rp );
if (highDetailNeeded) { if (highDetailNeeded) {
highDetailComputed = true; highDetailRawComputed = true;
if (params.hlrecovery.enabled && params.hlrecovery.method=="Color") { if (params.hlrecovery.enabled && params.hlrecovery.method=="Color") {
todo |= M_INIT; todo |= M_INIT;
} }
} }
else else
highDetailComputed = false; highDetailRawComputed = false;
} }

3
rtengine/improccoordinator.h
View File

@@ -60,7 +60,8 @@ class ImProcCoordinator : public StagedImageProcessor {
ImProcFunctions ipf; ImProcFunctions ipf;
int scale; int scale;
bool highDetailComputed; bool highDetailPreprocessComputed;
bool highDetailRawComputed;
bool allocated; bool allocated;
void freeAll (); void freeAll ();