merge with dev

2018-12-26 10:11:29 +01:00
parent ed9b54db5a 3461328a8c
commit 08c6fc9d5f
9 changed files with 14 additions and 9 deletions
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -1209,6 +1209,11 @@ Camera constants:
        "ranges": { "white": 4050 }
    },

+    { // Quality C
+        "make_model": "Canon PowerShot SX50 HS",
+        "ranges": { "white": 4050 }
+    },
+
    { // Quality B
        "make_model": "Canon PowerShot SX60 HS",
        "dcraw_matrix": [ 13161,-5451,-1344,-1989,10654,1531,-47,1271,4955 ], // DNG_V8.7 D65
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -474,7 +474,7 @@ RawImageSource::~RawImageSource()
        delete riFrames[i];
    }

-    for (size_t i = 0; i < numFrames - 1; ++i) {
+    for(size_t i = 0; i + 1 < numFrames; ++i) {
        delete rawDataBuffer[i];
    }