diff --git a/rtdata/dcpprofiles/NIKON Z 8.dcp b/rtdata/dcpprofiles/NIKON Z 8.dcp new file mode 100644 index 000000000..cbd59f051 Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z 8.dcp differ diff --git a/rtdata/dcpprofiles/NIKON Z 9.dcp b/rtdata/dcpprofiles/NIKON Z 9.dcp new file mode 100644 index 000000000..9f644ae41 Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z 9.dcp differ diff --git a/rtdata/dcpprofiles/NIKON Z F.dcp b/rtdata/dcpprofiles/NIKON Z F.dcp new file mode 100644 index 000000000..f8f5c4bad Binary files /dev/null and b/rtdata/dcpprofiles/NIKON Z F.dcp differ diff --git a/rtdata/dcpprofiles/camera_model_aliases.json b/rtdata/dcpprofiles/camera_model_aliases.json index 49e981121..20b0592a6 100644 --- a/rtdata/dcpprofiles/camera_model_aliases.json +++ b/rtdata/dcpprofiles/camera_model_aliases.json @@ -20,6 +20,8 @@ "Canon EOS 2000D": ["Canon EOS 1500D", "Canon EOS Kiss X90", "Canon EOS Rebel T7"], "Canon EOS 4000D": ["Canon EOS 3000D", "Canon EOS Rebel T100"], + "FUJIFILM GFX 100": ["FUJIFILM GFX 100S", "FUJIFILM GFX100S"], + "MINOLTA DYNAX 5D": ["Minolta Maxxum 5D", "Minolta Alpha 5D", "Minolta Alpha Sweet"], "MINOLTA DYNAX 7D": ["Minolta Maxxum 7D", "Minolta Alpha 7D"], diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 8abe2a7b9..54bc65c23 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -1447,13 +1447,15 @@ Camera constants: }, { // Quality C - "make_model": [ "FUJIFILM GFX 100", "FUJIFILM GFX100S" ], + "make_model": [ "FUJIFILM GFX 100", "FUJIFILM GFX100S", "FUJIFILM GFX 100S", "FUJIFILM GFX 100 II" ], "dcraw_matrix" : [ 16212, -8423, -1583, -4336, 12583, 1937, -195, 726, 6199 ], // taken from ART "raw_crop": [ // multi-aspect crop to account for 16-shot pixel shift images { "frame" : [11808, 8754], "crop" : [ 0, 2, 11664, 8734 ] }, { "frame" : [23616, 17508], "crop" : [ 0, 4, 23328, 17468 ] } - ] + ], + "pdaf_pattern" : [ 0, 18 ], // From ART + "pdaf_offset" : 0 }, { // Quality C @@ -3138,7 +3140,7 @@ Camera constants: { // Quality B "make_model": [ "Sony ILCE-7CR", "Sony ILCE-7RM5" ], // 7RM5 is assumed to have the same sensor as the 7CR. "dcraw_matrix": [ 8200, -2976, -719, -4296, 12053, 2532, -429, 1282, 5774 ], // DNG v15.2 for ILCE-7CR and ILCE-7RM5. - "raw_crop": [ 0, 0, -32, 0 ], // A few repeated pixels on the right edge. + "raw_crop": [ 0, 0, 9564, 6374 ], // From ART "pdaf_pattern": [ 0,12,18,36,42,60,66,72,78,96,108,120,126,138,156,168,180,186,192,198,210,222,228,240,246,252,270,276,282,288,306,312,318,330,336,348,360,366,372,378,390,396,408,420 ], // From issue #6938. Slightly different every repetition, maybe the real pattern is 3 or more multiples of 420 pixels. This is a composite. "pdaf_offset": 1 }, @@ -3155,6 +3157,11 @@ Camera constants: "pdaf_offset" : -7 }, + { // Quality C + "make_model": "SONY ILCE-9M3", + "raw_crop": [ 8, 8, 6008, 4008 ] // From ART + }, + { // Quality B, correction for frame width "make_model": [ "Sony ILCE-7S", "Sony ILCE-7SM2" ], "dcraw_matrix": [ 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 ], // DNG_v9.2 D65