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

OMP speedup for icc profiles (see issue 1462)

Browse Source
This commit is contained in:
michael
2012-07-07 20:37:51 -04:00
parent 20ecdd5bf9
commit c1701da96b
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rtengine/rawimagesource.cc
View File

@@ -1790,8 +1790,8 @@ void RawImageSource::colorSpaceConversion (Imagefloat* im, ColorManagementParams
lcmsMutex->unlock (); lcmsMutex->unlock ();
if (hTransform) { if (hTransform) {
im->ExecCMSTransform(hTransform); im->ExecCMSTransform(hTransform);
} }
else { else {
// create the profile from camera // create the profile from camera
lcmsMutex->lock (); lcmsMutex->lock ();
hTransform = cmsCreateTransform (camprofile, TYPE_RGB_FLT, out, TYPE_RGB_FLT, settings->colorimetricIntent, hTransform = cmsCreateTransform (camprofile, TYPE_RGB_FLT, out, TYPE_RGB_FLT, settings->colorimetricIntent,
@@ -1799,24 +1799,25 @@ void RawImageSource::colorSpaceConversion (Imagefloat* im, ColorManagementParams
lcmsMutex->unlock (); lcmsMutex->unlock ();
im->ExecCMSTransform(hTransform); im->ExecCMSTransform(hTransform);
} }
float x, y,z;
Glib::ustring choiceprofile; Glib::ustring choiceprofile;
choiceprofile=cmp.working; choiceprofile=cmp.working;
if(choiceprofile!="ProPhoto") { if(choiceprofile!="ProPhoto") {
for ( int h = 0; h < im->height; ++h ) #pragma omp parallel for
for ( int w = 0; w < im->width; ++w ) {//convert from Prophoto to XYZ for ( int h = 0; h < im->height; ++h )
x = (toxyz[0][0] * im->r[h][w] + toxyz[0][1] * im->g[h][w] + toxyz[0][2] * im->b[h][w] ) ; for ( int w = 0; w < im->width; ++w ) {//convert from Prophoto to XYZ
y = (toxyz[1][0] * im->r[h][w] + toxyz[1][1] * im->g[h][w] + toxyz[1][2] * im->b[h][w] ) ; float x, y,z;
z = (toxyz[2][0] * im->r[h][w] + toxyz[2][1] * im->g[h][w] + toxyz[2][2] * im->b[h][w] ) ; x = (toxyz[0][0] * im->r[h][w] + toxyz[0][1] * im->g[h][w] + toxyz[0][2] * im->b[h][w] ) ;
//convert from XYZ to cmp.working (sRGB...Adobe...Wide..) y = (toxyz[1][0] * im->r[h][w] + toxyz[1][1] * im->g[h][w] + toxyz[1][2] * im->b[h][w] ) ;
im->r[h][w] = ((wiprof[0][0]*x + wiprof[0][1]*y + wiprof[0][2]*z)) ; z = (toxyz[2][0] * im->r[h][w] + toxyz[2][1] * im->g[h][w] + toxyz[2][2] * im->b[h][w] ) ;
im->g[h][w] = ((wiprof[1][0]*x + wiprof[1][1]*y + wiprof[1][2]*z)) ; //convert from XYZ to cmp.working (sRGB...Adobe...Wide..)
im->b[h][w] = ((wiprof[2][0]*x + wiprof[2][1]*y + wiprof[2][2]*z)) ; im->r[h][w] = ((wiprof[0][0]*x + wiprof[0][1]*y + wiprof[0][2]*z)) ;
} im->g[h][w] = ((wiprof[1][0]*x + wiprof[1][1]*y + wiprof[1][2]*z)) ;
} im->b[h][w] = ((wiprof[2][0]*x + wiprof[2][1]*y + wiprof[2][2]*z)) ;
}
}
cmsDeleteTransform(hTransform); cmsDeleteTransform(hTransform);
} }
else { else {