Threading cleanups

2011-06-21 21:59:51 +02:00
parent 0583d2bc39
commit c1a8e6bbbd
13 changed files with 260 additions and 276 deletions
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -208,8 +208,7 @@ void RawImageSource::transformRect (PreviewProps pp, int tran, int &ssx1, int &s

 void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewProps pp, HRecParams hrp, ColorManagementParams cmp, RAWParams raw )
 {
-
-    isrcMutex.lock ();
+    Glib::Mutex::Lock lock(getImageMutex);

    tran = defTransform (tran);

@@ -421,8 +420,6 @@ void RawImageSource::getImage (ColorTemp ctemp, int tran, Imagefloat* image, Pre

    // Applying postmul
    colorSpaceConversion (image, cmp, embProfile, camProfile, xyz_cam, defGain);
-	
-    isrcMutex.unlock ();
 }
 	
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%