From 4ea92d3e93712125f7ffc5bd23d132e3646a142a Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Tue, 18 Feb 2020 18:06:21 +0100 Subject: [PATCH 1/2] Fix broken camonst.json --- rtengine/camconst.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 3deab9c38..f58167478 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1221,7 +1221,7 @@ Camera constants: { // Quality A, changes for raw crop which is wrong (larger) in dcraw "make_model": "Canon PowerShot S120", - "dcraw_matrix": [ 6961, -1685, -695, -4625, 12945, 1836, -1114, 2152, 5518 ] // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 12.2 + "dcraw_matrix": [ 6961, -1685, -695, -4625, 12945, 1836, -1114, 2152, 5518 ], // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 12.2 "raw_crop": [ 120, 30, 4024, 3030 ], "masked_areas": [ 32, 2, 3028, 80 ], "ranges": { "white": 4050 } From e7a4ae3c9fa987d625b537573fd811a9cb5d2fb8 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Tue, 18 Feb 2020 18:07:45 +0100 Subject: [PATCH 2/2] Fix segfault on close of RT when RT was started with a filename as argument --- rtgui/rtwindow.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 8cfeb8ec0..fc315e1b7 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -99,6 +99,8 @@ RTWindow::RTWindow () , bpanel (nullptr) , splash (nullptr) , btn_fullscreen (nullptr) + , iFullscreen (nullptr) + , iFullscreen_exit (nullptr) , epanel (nullptr) , fpanel (nullptr) {