From c1701da96b543ee77cf16801a02ecff2cf389b0b Mon Sep 17 00:00:00 2001
From: michael <michael@michaelezra.com>
Date: Sat, 7 Jul 2012 20:37:51 -0400
Subject: [PATCH] OMP speedup for icc profiles (see issue 1462)

---
 rtengine/rawimagesource.cc | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

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