liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis 2018-12-26 10:11:29 +01:00
commit 08c6fc9d5f
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/profiles/Auto-Matched Curve - ISO High.pp3
View File

@ -31,7 +31,7 @@ CCCurve=0;
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

2
rtdata/profiles/Auto-Matched Curve - ISO Low.pp3
View File

@ -10,7 +10,7 @@ Method=Blend
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

2
rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3
View File

@ -32,7 +32,7 @@ CCCurve=0;
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

2
rtdata/profiles/Standard Film Curve - ISO High.pp3
View File

@ -34,7 +34,7 @@ CCCurve=0;
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

2
rtdata/profiles/Standard Film Curve - ISO Low.pp3
View File

@ -12,7 +12,7 @@ Method=Blend
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

2
rtdata/profiles/Standard Film Curve - ISO Medium.pp3
View File

@ -34,7 +34,7 @@ CCCurve=0;
LcMode=lfauto LcMode=lfauto
UseDistortion=true UseDistortion=true
UseVignette=true UseVignette=true
UseCA=true UseCA=false
[Color Management] [Color Management]
ToneCurve=false ToneCurve=false

5
rtengine/camconst.json
View File

@ -1209,6 +1209,11 @@ Camera constants:
"ranges": { "white": 4050 } "ranges": { "white": 4050 }
}, },
{ // Quality C
"make_model": "Canon PowerShot SX50 HS",
"ranges": { "white": 4050 }
},
{ // Quality B { // Quality B
"make_model": "Canon PowerShot SX60 HS", "make_model": "Canon PowerShot SX60 HS",
"dcraw_matrix": [ 13161,-5451,-1344,-1989,10654,1531,-47,1271,4955 ], // DNG_V8.7 D65 "dcraw_matrix": [ 13161,-5451,-1344,-1989,10654,1531,-47,1271,4955 ], // DNG_V8.7 D65

2
rtengine/rawimagesource.cc
View File

@ -474,7 +474,7 @@ RawImageSource::~RawImageSource()
delete riFrames[i]; delete riFrames[i];
} }
for (size_t i = 0; i < numFrames - 1; ++i) { for(size_t i = 0; i + 1 < numFrames; ++i) {
delete rawDataBuffer[i]; delete rawDataBuffer[i];
} }

4
rtgui/filepanel.cc
View File

@ -301,7 +301,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
#ifdef WIN32 #ifdef WIN32
else { else {
Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + "</b>"; Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + "</b>";
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 (); msgd.run ();
goto MAXGDIHANDLESREACHED; goto MAXGDIHANDLESREACHED;
} }
@ -322,7 +322,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
} }
} else { } else {
Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n</b>"; Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + thm->getFileName() + "\" .\n</b>";
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 (); msgd.run ();
} }
#ifdef WIN32 #ifdef WIN32