Merged master into gtk3, manually copied rtgui/threadutils.h over from master

2016-01-31 00:00:28 +01:00
parent 978e9f67d6 4d3f1d92ad
commit f5d5083be6
12 changed files with 541 additions and 810 deletions
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -238,10 +238,7 @@ void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengi

 void FileBrowserEntry::_updateImage (rtengine::IImage8* img, double s, rtengine::procparams::CropParams cropParams)
 {
-
-#if PROTECT_VECTORS
    MYWRITERLOCK(l, lockRW);
-#endif

    redrawRequests--;
    scale = s;