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/batchqueueentry.cc
+++ b/rtgui/batchqueueentry.cc
@@ -244,10 +244,7 @@ void BatchQueueEntry::_updateImage (guint8* img, int w, int h)
 {

    if (preh == h) {
-
-#if PROTECT_VECTORS
        MYWRITERLOCK(l, lockRW);
-#endif

        prew = w;
        assert (preview == NULL);