Define raw crop for Sony ILCE-7M2 arw and dng files in camconst.json, fixes #4585

This commit is contained in:
heckflosse 2018-09-21 17:32:41 +02:00
parent 7fd276ba35
commit bb5e6ef234
2 changed files with 3 additions and 1 deletions

View File

@ -2319,6 +2319,7 @@ Camera constants:
{ // Quality A { // Quality A
"make_model": "Sony ILCE-7M2", "make_model": "Sony ILCE-7M2",
"raw_crop": [ 0, 0, 6024, 4024 ],
"dcraw_matrix": [ 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 ], // DNGv8.7.1 "dcraw_matrix": [ 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 ], // DNGv8.7.1
"ranges": { "black": 512, "white": 16300 } "ranges": { "black": 512, "white": 16300 }
}, },

View File

@ -9874,7 +9874,8 @@ konica_400z:
width -= height > 3664 ? 8 : 32; width -= height > 3664 ? 8 : 32;
if (!strncmp(model,"DSC",3)) if (!strncmp(model,"DSC",3))
black = 200 << (tiff_bps - 12); black = 200 << (tiff_bps - 12);
} else if (!strcmp(make,"Sony") && raw_width == 6048) { } else if (!strcmp(make,"Sony") && strcmp(model,"ILCE-7M2") && raw_width == 6048) {
// for Sony ILCE-7M2 the raw crop is defined in camconst.json
width -= 24; width -= 24;
if (strstr(model,"RX1") || strstr(model,"A99")) if (strstr(model,"RX1") || strstr(model,"A99"))
width -= 6; width -= 6;