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

2018-01-25 20:41:10 +01:00
parent e6659be98e c0ceeb2c95
commit b6d2480fb5
183 changed files with 9182 additions and 5571 deletions
--- a/rtengine/imagefloat.h
+++ b/rtengine/imagefloat.h
@@ -107,6 +107,7 @@ public:
    void                 calcCroppedHistogram(const ProcParams &params, float scale, LUTu & hist);

    void                 ExecCMSTransform(cmsHTRANSFORM hTransform);
+    void                 ExecCMSTransform(cmsHTRANSFORM hTransform, const LabImage &labImage, int cx, int cy);
 };

 }