Merge branch 'master' into spot-removal-tool

2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -551,6 +551,7 @@ public:
    bool working;
    bool output;
    bool outputIntent;
+    bool outputBPC;
    bool gamma;
    bool gampos;
    bool slpos;
@@ -791,7 +792,7 @@ public:
    bool                          exif;
    bool                          iptc;

-    ParamsEdited (bool value = false);
+    explicit ParamsEdited (bool value = false);

    void set   (bool v);
    void initFrom (const std::vector<rtengine::procparams::ProcParams>& src);