Merge branch 'dev' into spot-removal-tool (see #2239)

2017-11-25 23:30:52 +01:00
parent 81932ba2d6 3b7a382f1d
commit 20a0fb7af9
320 changed files with 17146 additions and 8522 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -58,6 +58,7 @@ protected:
    Imagefloat *spotprevi;
    LabImage *oprevl;
    LabImage *nprevl;
+    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;