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

Pentax K1 file in APS-C mode has wrong raw crop, fixes #3519

Browse Source
This commit is contained in:
heckflosse
2017-01-10 22:20:23 +01:00
parent f203f284d6
commit cef9b7fe2b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/camconst.json
View File

@@ -1784,7 +1784,7 @@ Camera constants:
"make_model": [ "RICOH PENTAX K-1", "PENTAX K-1" ],
"dcraw_matrix": [ 8596,-2981,-639,-4202,12046,2431,-685,1424,6122 ], // adobe DNG v9.7 D65
//"dcraw_matrix": [ 8566,-2746,-1201,-3612,12204,1550,-893,1680,6264 ], // PENTAX DNG
"raw_crop": [ 6, 18, 7376, 4932 ], // full frame 7392x4950, cropped to official DNG raw_crop 6,18,7382,4950, official jpeg crop 8,10,7360x4912
//"raw_crop": [ 6, 18, 7376, 4932 ], // full frame 7392x4950, cropped to official DNG raw_crop 6,18,7382,4950, official jpeg crop 8,10,7360x4912
"ranges": {
"white": [
{ "iso": [ 100, 200, 400, 800 ], "levels": 16300 }, // 16380

4
rtengine/dcraw.cc
View File

@@ -8743,6 +8743,10 @@ void CLASS identify()
if (width == 7424 && !strcmp(model,"645D"))
{ height = 5502; width = 7328; filters = 0x61616161; top_margin = 29;
left_margin = 48; }
if (width == 7392 && !strncmp(model,"K-1",3))
{ left_margin = 6; width = 7376; if(!dng_version) {top_margin = 18; height -= top_margin; }}
if (width == 4832 && !strncmp(model,"K-1",3)) // K-1 APS-C format
if(!dng_version) {top_margin = 18; height -= top_margin; }
if (height == 3014 && width == 4096) /* Ricoh GX200 */
width = 4014;
if (dng_version) {