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/processingjob.h
+++ b/rtengine/processingjob.h
@@ -37,7 +37,7 @@ public:
        : fname(fn), isRaw(iR), initialImage(nullptr), pparams(pp) {}

    ProcessingJobImpl (InitialImage* iImage, const procparams::ProcParams& pp)
-        : fname(""), initialImage(iImage), pparams(pp)
+        : fname(""), isRaw(true), initialImage(iImage), pparams(pp)
    {
        iImage->increaseRef();
    }