Merge branch 'dev' into spot-removal-tool

2019-08-06 15:19:38 +02:00
parent 0db64d49a2 972d6907d5
commit e3052c67e2
16 changed files with 52 additions and 31 deletions
--- a/rtengine/imagefloat.h
+++ b/rtengine/imagefloat.h
@@ -63,7 +63,7 @@ public:
    }

    void getScanline (int row, unsigned char* buffer, int bps, bool isFloat = false) const override;
-    void setScanline (int row, unsigned char* buffer, int bps, unsigned int numSamples) override;
+    void setScanline (int row, const unsigned char* buffer, int bps, unsigned int numSamples) override;

    // functions inherited from IImagefloat:
    MyMutex& getMutex () override