Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtengine/image16.h
+++ b/rtengine/image16.h
@@ -96,7 +96,7 @@ public:
        delete this;
    }

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

 }