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

Remove the redundant isColorProfile dirty flag, but keep updating the monitor profile using processing parameter change events.

Browse Source
This commit is contained in:
Adam Reichold
2016-01-01 20:10:48 +01:00
parent 5fd5d5bece
commit cefb221220
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtengine/improccoordinator.cc
View File

@@ -32,7 +32,7 @@ extern const Settings* settings;
ImProcCoordinator::ImProcCoordinator ()
: orig_prev(NULL), oprevi(NULL), oprevl(NULL), nprevl(NULL), previmg(NULL), workimg(NULL),
ncie(NULL), imgsrc(NULL), shmap(NULL), lastAwbEqual(0.), ipf(&params, true), monitorIntent(RI_PERCEPTUAL), scale(10),
highDetailPreprocessComputed(false), highDetailRawComputed(false), allocated(false), isColorProfileDirty(true),
highDetailPreprocessComputed(false), highDetailRawComputed(false), allocated(false),
bwAutoR(-9000.f), bwAutoG(-9000.f), bwAutoB(-9000.f), CAMMean(0.),
hltonecurve(65536),
@@ -781,10 +781,9 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
}
}
// Update the output color transform if necessary
if (isColorProfileDirty || (todo & M_MONITOR)) {
// Update the monitor color transform if necessary
if (todo & M_MONITOR) {
ipf.updateColorProfiles(params.icm, monitorProfile, monitorIntent);
isColorProfileDirty = false;
}
// process crop, if needed
@@ -1132,19 +1131,13 @@ void ImProcCoordinator::getAutoCrop (double ratio, int &x, int &y, int &w, int &
y = (fullh - h) / 2;
}
void ImProcCoordinator::setMonitorProfile (Glib::ustring profile, RenderingIntent intent)
void ImProcCoordinator::setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent)
{
if (profile != monitorProfile) {
monitorProfile = profile;
isColorProfileDirty = true;
}
if (intent != monitorIntent) {
monitorIntent = intent;
isColorProfileDirty = true;
}
monitorProfile = profile;
monitorIntent = intent;
}
void ImProcCoordinator::getMonitorProfile (Glib::ustring &profile, RenderingIntent &intent)
void ImProcCoordinator::getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const
{
profile = monitorProfile;
intent = monitorIntent;

6
rtengine/improccoordinator.h
View File

@@ -81,8 +81,6 @@ protected:
bool highDetailRawComputed;
bool allocated;
bool isColorProfileDirty;
void freeAll ();
// Precomputed values used by DetailedCrop ----------------------------------------------
@@ -255,8 +253,8 @@ public:
void getSpotWB (int x, int y, int rectSize, double& temp, double& green);
void getAutoCrop (double ratio, int &x, int &y, int &w, int &h);
void setMonitorProfile (Glib::ustring profile, RenderingIntent intent);
void getMonitorProfile (Glib::ustring &profile, RenderingIntent &intent);
void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent);
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const;
bool updateTryLock ()
{

4
rtengine/rtengine.h
View File

@@ -416,8 +416,8 @@ public:
virtual void setRetinexListener (RetinexListener* l) = 0;
virtual void setWaveletListener (WaveletListener* l) = 0;
virtual void setMonitorProfile (Glib::ustring monitorProfile, RenderingIntent intent) = 0;
virtual void getMonitorProfile (Glib::ustring &monitorProfile, RenderingIntent &intent) = 0;
virtual void setMonitorProfile (const Glib::ustring& monitorProfile, RenderingIntent intent) = 0;
virtual void getMonitorProfile (Glib::ustring& monitorProfile, RenderingIntent& intent) const = 0;
virtual ~StagedImageProcessor () {}