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/stdimagesource.h
+++ b/rtengine/stdimagesource.h
@@ -32,8 +32,6 @@ protected:
    ColorTemp wb;
    ProgressListener* plistener;
    bool full;
-    float** hrmap[3];
-    char** needhr;
    int max[3];
    bool rgbSourceModified;

@@ -66,7 +64,7 @@ public:
    }

    void        getFullSize (int& w, int& h, int tr = TR_NONE);
-    void        getSize     (int tran, PreviewProps pp, int& w, int& h);
+    void        getSize     (PreviewProps pp, int& w, int& h);

    ImageData*  getImageData ()
    {