Merge with e482a17a8e1359e90e1d844d268bf005bfac1c7a

2012-07-04 13:09:50 -04:00
parent 3a4100e710
commit 952feb48b2
25 changed files with 790 additions and 321 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -60,7 +60,7 @@ class ImProcCoordinator : public StagedImageProcessor {
        ImProcFunctions ipf;

        int scale;
-        bool lastHighDetail;  // was the last update running in high detail?
+        bool highDetailComputed;
        bool allocated;

        void freeAll ();