Serialze read of tiff files, Issue 2722

2015-03-28 13:12:42 +01:00
parent 38355b3ef1
commit 3e4b8152c3
6 changed files with 28 additions and 5 deletions
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -570,7 +570,12 @@ int ImageIO::getTIFFSampleFormat (Glib::ustring fname, IIOSampleFormat &sFormat,
 }

 int ImageIO::loadTIFF (Glib::ustring fname) {
-
+
+	static MyMutex thumbMutex;
+	MyMutex::MyLock lock(thumbMutex);
+	if(!options.serializeTiffRead)
+		lock.release();
+		
 #ifdef WIN32
    wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (fname.c_str(), -1, NULL, NULL, NULL);
    TIFF* in = TIFFOpenW (wfilename, "r");