Merge branch 'master' into softproofing

2016-10-16 01:45:52 +02:00
parent 81c5b1ca41 29d5329f3f
commit 50165dab20
159 changed files with 15819 additions and 2723 deletions
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@@ -46,8 +46,8 @@ public:
    ProfileContent (const ProfileContent& other);
    ProfileContent& operator= (const rtengine::ProfileContent& other);

-    ProfileContent (const Glib::ustring& fileName);
-    ProfileContent (cmsHPROFILE hProfile);
+    explicit ProfileContent (const Glib::ustring& fileName);
+    explicit ProfileContent (cmsHPROFILE hProfile);
    cmsHPROFILE toProfile () const;
 };