From 01cb4fb36cecb6588f5b5bee1620bec3a874d084 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 21 Dec 2018 14:01:08 +0100 Subject: [PATCH 1/3] Disabled lensfun CA correction in default profiles If the lensfun profile supports CA correction, having both lensfun CA correction and raw auto-CA correction enabled leads to artifacts as they badly interact with each other. Issue #5110 --- rtdata/profiles/Auto-Matched Curve - ISO High.pp3 | 2 +- rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 | 2 +- rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO High.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO Low.pp3 | 2 +- rtdata/profiles/Standard Film Curve - ISO Medium.pp3 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 index 6108ea54c..99f0af8fe 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 @@ -31,7 +31,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 index d8be8d795..882c0130f 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 @@ -10,7 +10,7 @@ Method=Blend LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 index a976fdd90..f9196bb30 100644 --- a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 @@ -32,7 +32,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO High.pp3 b/rtdata/profiles/Standard Film Curve - ISO High.pp3 index ae134e7f4..4dd3a9b1d 100644 --- a/rtdata/profiles/Standard Film Curve - ISO High.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO High.pp3 @@ -34,7 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 index 4f6ad62c2..c23b5b8a4 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 @@ -12,7 +12,7 @@ Method=Blend LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false diff --git a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 index 4921ffb22..4aff630f5 100644 --- a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 +++ b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 @@ -34,7 +34,7 @@ CCCurve=0; LcMode=lfauto UseDistortion=true UseVignette=true -UseCA=true +UseCA=false [Color Management] ToneCurve=false From 0918d295788da75b60152a8c1140d1f4b3bb2c54 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 21 Dec 2018 21:34:47 +0100 Subject: [PATCH 2/3] Better white level for Canon PowerShot SX50 HS --- rtengine/camconst.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 7aab3b0bd..55acf8307 100644 --- 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 From 3461328a8c6006734c74bf15b82cb99702c53bde Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 21 Dec 2018 21:36:22 +0100 Subject: [PATCH 3/3] Opening a locked raw file in RawTherapee causes crash, fixes #5111 --- rtengine/rawimagesource.cc | 2 +- rtgui/filepanel.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 3c7a34e73..b59e8ecab 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -473,7 +473,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]; } diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index 23b7c3983..aef2b0a22 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -301,7 +301,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + ""; - Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); goto MAXGDIHANDLESREACHED; } @@ -322,7 +322,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n"; - Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); } #ifdef WIN32