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

CR3 bbp fix & camconst entries for Canon EOS R5/R6 and Nikon Z7

Browse Source 
Fix, matrices and DCP files courtesy of ART (Alberto Griggio <agriggio@users.noreply.github.com>)
This commit is contained in:
Kevin Murray
2020-09-10 19:12:20 +10:00
committed by GitHub
parent ec0947e288
commit 38d214ed62
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/dcpprofiles/CANON EOS R5.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/CANON EOS R6.dcp Normal file
View File

Binary file not shown.

21
rtengine/camconst.json
View File

@@ -1149,6 +1149,22 @@ Camera constants:
"raw_crop": [ 144, 46, 6744, 4500 ]
},
{ // Quality C
"make_model": "Canon EOS R5",
"dcraw_matrix" : [9766, -2953, -1254, -4276, 12116, 2433, -437, 1336, 5131],
"raw_crop" : [ 124, 92, 8220, 5486 ],
"masked_areas" : [ 94, 20, 5578, 122 ],
"ranges" : { "white" : 16382 }
},
{ // Quality C
"make_model": "Canon EOS R6",
"dcraw_matrix" : [8293, -1611, -1132, -4759, 12710, 2275, -1013, 2415, 5508],
"raw_crop": [ 72, 38, 5496, 3670 ],
"masked_areas" : [ 40, 10, 5534, 70 ],
"ranges" : { "white" : 16382 }
},
// Canon Powershot
{ // Quality C, CHDK DNGs, raw frame correction
"make_model": "Canon PowerShot A3100 IS",
@@ -1729,6 +1745,11 @@ Camera constants:
"pdaf_offset" : 32
},
{ // Quality C, only dcraw looted from ART commit ad88c7d97
"make_model" : "NIKON Z 5",
"dcraw_matrix" : [8695, -2558, -648, -5015, 12711, 2575, -1279, 2215, 7514]
},
{ // Quality A, white levels and PDAF lines measured by Yann Leprince #5851
"make_model" : "Nikon Z 50",
"dcraw_matrix" : [11640, -4829, -1079, -5107, 13006, 2325, -972, 1711, 7380], // Adobe DNG Converter 12.2.1 ColorMatrix2 (D65)

3
rtengine/canon_cr3_decoder.cc
View File

@@ -3132,7 +3132,8 @@ void DCraw::crxLoadRaw()
hdr.tileHeight >>= 1;
}
// /*imgdata.color.*/maximum = (1 << hdr.nBits) - 1;
// /*imgdata.color.*/maximum = (1 << hdr.nBits) - 1;
tiff_bps = hdr.nBits;
std::uint8_t* const hdrBuf = static_cast<std::uint8_t*>(malloc(hdr.mdatHdrSize));