Merge pull request #7002 from sgotti/dcraw_fujifilm_gfx_100ii

dcraw: add support for Fujifilm GFX 100 II
This commit is contained in:
Lawrence37 2024-04-14 12:18:31 -07:00 committed by GitHub
commit 73fb89147c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions

View File

@ -1456,6 +1456,17 @@ Camera constants:
]
},
{ // Quality C
"make_model": [ "FUJIFILM GFX100 II" ],
"dcraw_matrix" : [ 12806, -5779, -1110, -3546, 11507, 2318, -177, 996, 5715 ], // adobe dcp d65
"raw_crop": [
// multi-aspect crop to account for 16-shot pixel shift images
{ "frame" : [11808, 8754], "crop" : [ 0, 0, 11664, 8750 ] },
// this crop has been copied from the GFX 100 one, no sample pixel shift images are available
{ "frame" : [23616, 17508], "crop" : [ 0, 4, 23328, 17468 ] }
]
},
{ // Quality B
"make_model": [ "FUJIFILM GFX 50R", "FUJIFILM GFX 50S", "FUJIFILM GFX50S II" ],
"dcraw_matrix": [ 11756,-4754,-874,-3056,11045,2305,-381,1457,6006 ], // DNGv9.9 D65

View File

@ -9676,7 +9676,7 @@ void CLASS identify()
apply_tiff();
if (!strcmp(model, "X-T3")) {
height = raw_height - 2;
} else if (!strcmp(model, "GFX 100") || !strcmp(model, "GFX100S")) {
} else if (!strcmp(model, "GFX 100") || !strcmp(model, "GFX100S") || !strcmp(model, "GFX100 II")) {
load_flags = 0;
}
if (!load_raw) {