merge with dev

2017-11-19 09:08:45 +01:00
parent 1483f28bfb f6bd06a06c
commit 75cec00e95
51 changed files with 2253 additions and 409 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -62,6 +62,7 @@ protected:
    LabImage *nprevl;
    LabImage *reserv;

+    Imagefloat *fattal_11_dcrop_cache; // global cache for ToneMapFattal02 used in 1:1 detail windows (except when denoise is active)
    Image8 *previmg;  // displayed image in monitor color space, showing the output profile as well (soft-proofing enabled, which then correspond to workimg) or not
    Image8 *workimg;  // internal image in output color space for analysis
    CieImage *ncie;