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

Merge pull request #7215 from Lawrence37/pixelshift-ilce-7cr

Browse Source 
make_arq and Sony ILCE-7CR Pixel Shift support
This commit is contained in:
Lawrence37 2024-10-26 12:23:25 -07:00 committed by GitHub
commit a924a81b31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/camconst.json
View File

@ -3140,7 +3140,10 @@ 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, 9564, 6374 ], // From ART
"raw_crop": [
{ "frame" : [19200, 12752], "crop" : [ 4, 3, 19128, 12749 ] },
{ "frame" : [0, 0], "crop" : [ 0, 0, 9564, 6374 ] }
], // Adapted 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
},

5
rtengine/dcraw.cc
View File

@ -7236,7 +7236,10 @@ void CLASS apply_tiff()
load_raw = &CLASS olympus_load_raw;
// ------- RT -------
if (!strncmp(make,"SONY",4) &&
(!strncmp(model,"ILCE-7RM3",9) || !strncmp(model,"ILCE-7RM4",9) || !strncmp(model,"ILCE-1",6)) &&
(!strncmp(model,"ILCE-7RM3",9) ||
!strncmp(model,"ILCE-7RM4",9) ||
!strncmp(model,"ILCE-1",6) ||
!strncmp(RT_software.c_str(), "make_arq", 8)) &&
tiff_samples == 4 &&
tiff_ifd[raw].bytes == raw_width*raw_height*tiff_samples*2) {
load_raw = &CLASS sony_arq_load_raw;

2
rtengine/imagedata.cc
View File

@ -785,7 +785,7 @@ FramesData::FramesData(const Glib::ustring &fname, time_t ts) :
find_exif_tag("Exif.SubImage1.Compression") && to_long(pos) == 1) {
isPixelShift = true;
}
} else if (bps != exif.end() && to_long(bps) == 14 &&
} else if (bps != exif.end() && (to_long(bps) == 14 || to_long(bps) == 16) &&
spp != exif.end() && to_long(spp) == 4 &&
c != exif.end() && to_long(c) == 1 &&
find_exif_tag("Exif.Image.Software") &&