Merge branch 'dev' into multiframe-handling

2017-10-04 23:34:28 +02:00
parent bb874bcce7 55172ee7ac
commit 180912df0f
69 changed files with 1461 additions and 1225 deletions
--- a/rtengine/rawimage.h
+++ b/rtengine/rawimage.h
@@ -121,7 +121,7 @@ public:
    {
        return image;
    }
-    float** compress_image(int frameNum); // revert to compressed pixels format and release image data
+    float** compress_image(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 { return is_raw; }