Merge branch 'master' into gtk3

2016-05-01 22:49:36 +02:00
parent a47043d6cd add88cc62c
commit 5294d22bd1
11 changed files with 711 additions and 558 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -861,7 +861,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p

    // if clut was used and size of clut cache == 1 we free the memory used by the clutstore (default clut cache size = 1 for 32 bit OS)
    if ( params.filmSimulation.enabled && !params.filmSimulation.clutFilename.empty() && options.clutCacheSize == 1) {
-        clutStore.clearCache();
+        CLUTStore::getInstance().clearCache();
    }

    // freeing up some memory