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

added support for Sony A7rIV 16-shot pixel-shift files, ported from ART, thanks to @agriggio

Browse Source
This commit is contained in:
Ingo Weyrich 2019-11-22 17:26:44 +01:00
parent 81f9ab7315
commit 614458c3c6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/camconst.json
View File

@ -2516,7 +2516,7 @@ Camera constants:
{ // Quality C, { // Quality C,
"make_model": "Sony ILCE-7RM4", "make_model": "Sony ILCE-7RM4",
"raw_crop": [ 0, 0, 9568, 0 ] // full raw frame 9600x6376 - 32 rightmost columns are garbage "raw_crop": [ 0, 0, -32, 0 ] // full raw frame 9600x6376 - 32 rightmost columns are garbage. Using -32 instead of 9568 to support also 16-shot pixelshift files
}, },
{ // Quality B, color matrix copied from a7rm2 { // Quality B, color matrix copied from a7rm2

6
rtengine/dcraw.cc
View File

@ -7015,7 +7015,8 @@ int CLASS parse_tiff (int base)
void CLASS apply_tiff() void CLASS apply_tiff()
{ {
int max_samp=0, ties=0, os, ns, raw=-1, thm=-1, i; int max_samp=0, ties=0, /*os, ns,*/ raw=-1, thm=-1, i;
uint64_t os, ns; // RT
struct jhead jh; struct jhead jh;
thumb_misc = 16; thumb_misc = 16;
@ -7045,6 +7046,7 @@ void CLASS apply_tiff()
} }
if ((tiff_ifd[i].comp != 6 || tiff_ifd[i].samples != 3) && if ((tiff_ifd[i].comp != 6 || tiff_ifd[i].samples != 3) &&
(tiff_ifd[i].width | tiff_ifd[i].height) < 0x10000 && (tiff_ifd[i].width | tiff_ifd[i].height) < 0x10000 &&
(unsigned)tiff_ifd[i].bps < 33 && (unsigned)tiff_ifd[i].samples < 13 && // RT
ns && ((ns > os && (ties = 1)) || ns && ((ns > os && (ties = 1)) ||
(ns == os && shot_select == ties++))) { (ns == os && shot_select == ties++))) {
raw_width = tiff_ifd[i].width; raw_width = tiff_ifd[i].width;
@ -7112,7 +7114,7 @@ void CLASS apply_tiff()
load_raw = &CLASS olympus_load_raw; load_raw = &CLASS olympus_load_raw;
// ------- RT ------- // ------- RT -------
if (!strncmp(make,"SONY",4) && if (!strncmp(make,"SONY",4) &&
!strncmp(model,"ILCE-7RM3",9) && (!strncmp(model,"ILCE-7RM3",9) || !strncmp(model,"ILCE-7RM4",9)) &&
tiff_samples == 4 && tiff_samples == 4 &&
tiff_ifd[raw].bytes == raw_width*raw_height*tiff_samples*2) { tiff_ifd[raw].bytes == raw_width*raw_height*tiff_samples*2) {
load_raw = &CLASS sony_arq_load_raw; load_raw = &CLASS sony_arq_load_raw;