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

Preview performance improvement when using monitor profile

Browse Source 
see issue #964
This commit is contained in:
Oliver Duis
2011-09-03 14:05:57 +02:00
parent a75a41eb6d
commit 9ac2163c70
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/improcfun.cc
View File

@@ -157,7 +157,7 @@ void ImProcFunctions::firstAnalysis (Imagefloat* original, const ProcParams* par
cmsHPROFILE iprof = iccStore->getXYZProfile (); cmsHPROFILE iprof = iccStore->getXYZProfile ();
lcmsMutex->lock (); lcmsMutex->lock ();
monitorTransform = cmsCreateTransform (iprof, TYPE_RGB_FLT, monitor, TYPE_RGB_8, settings->colorimetricIntent, monitorTransform = cmsCreateTransform (iprof, TYPE_RGB_FLT, monitor, TYPE_RGB_8, settings->colorimetricIntent,
settings->LCMSSafeMode ? cmsFLAGS_NOOPTIMIZE : cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE ); // NOCACHE is important for thread safety cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE ); // NOCACHE is important for thread safety
lcmsMutex->unlock (); lcmsMutex->unlock ();
} }

10
rtengine/iplab2rgb.cc
View File

@@ -62,7 +62,7 @@ void ImProcFunctions::lab2rgb (LabImage* lab, Image8* image) {
if (monitorTransform) { if (monitorTransform) {
// cmsDoTransform is relatively expensive // cmsDoTransform is relatively expensive
#pragma omp parallel for if (multiThread) #pragma omp parallel for
for (int i=0; i<lab->H; i++) { for (int i=0; i<lab->H; i++) {
float buffer[3*lab->W]; float buffer[3*lab->W];
float g; float g;
@@ -91,9 +91,7 @@ void ImProcFunctions::lab2rgb (LabImage* lab, Image8* image) {
buffer[iy++] = CLIP01(z_); buffer[iy++] = CLIP01(z_);
} }
if (settings->LCMSSafeMode) lcmsMutex->lock ();
cmsDoTransform (monitorTransform, buffer, image->data + ix, lab->W); cmsDoTransform (monitorTransform, buffer, image->data + ix, lab->W);
if (settings->LCMSSafeMode) lcmsMutex->unlock ();
} }
} else { } else {
@@ -153,11 +151,11 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
cmsHPROFILE iprof = iccStore->getXYZProfile (); cmsHPROFILE iprof = iccStore->getXYZProfile ();
lcmsMutex->lock (); lcmsMutex->lock ();
cmsHTRANSFORM hTransform = cmsCreateTransform (iprof, TYPE_RGB_16, oprof, TYPE_RGB_8, settings->colorimetricIntent, cmsHTRANSFORM hTransform = cmsCreateTransform (iprof, TYPE_RGB_16, oprof, TYPE_RGB_8, settings->colorimetricIntent,
settings->LCMSSafeMode ? cmsFLAGS_NOOPTIMIZE : cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE ); // NOCACHE is important for thread safety cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE ); // NOCACHE is important for thread safety
lcmsMutex->unlock (); lcmsMutex->unlock ();
// cmsDoTransform is relatively expensive // cmsDoTransform is relatively expensive
#pragma omp parallel for if (multiThread) #pragma omp parallel for
for (int i=cy; i<cy+ch; i++) { for (int i=cy; i<cy+ch; i++) {
short buffer [3*cw]; short buffer [3*cw];
float g; float g;
@@ -184,9 +182,7 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
buffer[iy++] = CLIP((int)z_); buffer[iy++] = CLIP((int)z_);
} }
if (settings->LCMSSafeMode) lcmsMutex->lock ();
cmsDoTransform (hTransform, buffer, image->data + ix, cw); cmsDoTransform (hTransform, buffer, image->data + ix, cw);
if (settings->LCMSSafeMode) lcmsMutex->unlock ();
} }
cmsDeleteTransform(hTransform); cmsDeleteTransform(hTransform);