merge with dev

This commit is contained in:
Desmis
2019-04-09 14:58:12 +02:00
2 changed files with 3 additions and 2 deletions

Binary file not shown.

View File

@@ -1224,6 +1224,7 @@ Camera constants:
{ // Quality C
"make_model": "Canon PowerShot SX150 IS",
"dcraw_matrix": [ 13481, -4867, -1063, -2074, 9960, 2472, -170, 1474, 3894 ], // Adobe DNG Converter 11.1 ColorMatrix1 (there is only one matrix and illuminant, and it's for daylight)
"raw_crop": [ 26, 10, 4364, 3254 ] // cut 2pix left and right
},
@@ -1605,9 +1606,9 @@ Camera constants:
"make_model" : "Nikon Z 6",
"dcraw_matrix" : [8210, -2534, -683, -5355, 13338, 2212, -1143, 1929, 6464], // Adobe DNG Converter 11.1 Beta ColorMatrix2
"pdaf_pattern" : [0, 12],
"pdaf_offset" : 32
"pdaf_offset" : 32
},
{ // Quality B, 16Mp and 64Mp raw frames
"make_model": "OLYMPUS E-M5MarkII",
"dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // DNG_v8.8 D65