Merge branch 'dev' into spot-removal-tool

2017-08-20 21:06:09 +02:00
parent 3eeeb151ec 1e5382a03b
commit f75bed1bfa
566 changed files with 47792 additions and 35293 deletions
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@@ -176,7 +176,7 @@ public:

    void setMetadata (const rtexif::TagDirectory* eroot);
    void setMetadata (const rtexif::TagDirectory* eroot, const rtengine::procparams::ExifPairs& exif, const rtengine::procparams::IPTCPairs& iptcc);
-    void setOutputProfile  (char* pdata, int plen);
+    void setOutputProfile  (const char* pdata, int plen);
    MyMutex& mutex ()
    {
        return imutex;