merge with dev

2019-06-07 16:52:34 +02:00
parent 72adac534e 3b19b9f55b
commit b378b0f74c
2 changed files with 2 additions and 2 deletions
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -769,7 +769,7 @@ float** RawImage::compress_image(unsigned int frameNum, bool freeImage)
                this->data[row][col] = image[row * width + col][0];
            }
    } else {
-        if (get_maker() == "Sigma" && dng_version) { // Hack to prevent sigma dng files from crashing
+        if((get_maker() == "Sigma" || get_maker() == "Pentax" || get_maker() == "Sony") && dng_version) { // Hack to prevent sigma dng files and dng files from PixelShift2DNG from crashing
            height -= top_margin;
            width -= left_margin;
        }