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
2019-12-13 16:26:30 +01:00
parent e73c8666e2 0c10b1466e
commit d5f1a3ae3e
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/camconst.json
View File

@@ -1398,6 +1398,11 @@ Camera constants:
"raw_crop": [ 4, 4, -4, -4 ] // full raw 6016x4016, Official 6000x4000 "raw_crop": [ 4, 4, -4, -4 ] // full raw 6016x4016, Official 6000x4000
}, },
{ // Quality C, only raw crop
"make_model": "Leica SL2",
"raw_crop": [ 0, 0, 0, -18 ] // 18 rows at bottom are garbage
},
{ // Quality C { // Quality C
"make_model": "LG mobile LG-H815", "make_model": "LG mobile LG-H815",
"dcraw_matrix": [ 5859,547,-1250,-6484,15547,547,-2422,5625,3906 ], // DNG D65 "dcraw_matrix": [ 5859,547,-1250,-6484,15547,547,-2422,5625,3906 ], // DNG D65

4
rtengine/capturesharpening.cc
View File

@@ -700,6 +700,10 @@ namespace rtengine
void RawImageSource::captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) { void RawImageSource::captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) {
if (!(ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS || ri->get_colors() == 1)) {
return;
}
if (plistener) { if (plistener) {
plistener->setProgressStr(M("TP_PDSHARPENING_LABEL")); plistener->setProgressStr(M("TP_PDSHARPENING_LABEL"));
plistener->setProgress(0.0); plistener->setProgress(0.0);