merge with dev

This commit is contained in:
Desmis
2019-03-01 09:06:07 +01:00
6 changed files with 602 additions and 1699 deletions

View File

@@ -1305,12 +1305,6 @@ Camera constants:
"ranges": { "white": 16100 }
},
{ // Quality B
"make_model": "FUJIFILM X-E3",
"dcraw_matrix": [ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 ], // DNG v10 D65
"ranges": { "white": 16100 }
},
{ // Quality B
"make_model": "FUJIFILM X-PRO1",
"dcraw_matrix": [ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 ], // DNG_v9.4 D65
@@ -1318,15 +1312,17 @@ Camera constants:
},
{ // Quality B
"make_model": [ "FUJIFILM X-PRO2", "FUJIFILM X-T2", "FUJIFILM X100F", "FUJIFILM X-T20" ],
"make_model": [ "FUJIFILM X-T2", "FUJIFILM X-T20", "FUJIFILM X-E3", "FUJIFILM X100F", "FUJIFILM X-PRO2", "FUJIFILM X-H1" ],
"dcraw_matrix": [ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 ], // DNG_v9.4 D65
//"raw_crop": [ 0, 0, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - experimental crop
// "raw_crop": [ 0, 5, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - for lossless compressed files
// "raw_crop": [ 0, 0, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - for uncompressed files
"raw_crop": [ 0, 5, 6032, 4026 ], // full raw 6160,4032, Usable 6032,4026 - for uncompressed and lossless compressed files (but reduces height by 6 pixels)
"ranges": { "white": 16100 }
},
{ // Quality C, only raw crop
"make_model": [ "FUJIFILM X-T3" ],
"raw_crop": [ 0, 0, 6254, 0]
"raw_crop": [ 0, 5, 6252, 4176]
},
{ // Quality B