merge with dev

2018-11-20 17:50:33 +01:00
parent 333ac99532 aa286a32f9
commit 721972ee72
81 changed files with 2596 additions and 1853 deletions
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -121,7 +121,7 @@ public:
    {
        return image;
    }
-    float** compress_image(int frameNum, bool freeImage = true); // revert to compressed pixels format and release image data
+    float** compress_image(unsigned int frameNum, bool freeImage = true); // revert to compressed pixels format and release image data
    float** data;             // holds pixel values, data[i][j] corresponds to the ith row and jth column
    unsigned prefilters;               // original filters saved ( used for 4 color processing )
    unsigned int getFrameCount() const