merge with dev

2020-02-24 11:09:20 +01:00
parent b5b2c91078 17767ce0aa
commit 92fc0e307f
178 changed files with 4237 additions and 4548 deletions
--- a/rtengine/stdimagesource.cc
+++ b/rtengine/stdimagesource.cc
@@ -55,7 +55,6 @@ template<class T> T** allocArray (int W, int H)
    return t;
 }

-#define HR_SCALE 2
 StdImageSource::StdImageSource () : ImageSource(), img(nullptr), plistener(nullptr), full(false), max{}, rgbSourceModified(false)
 {