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

decode Nikon Z7 uncompressed 12-bit NEF, #4801

Browse Source
This commit is contained in:
heckflosse
2018-09-17 12:30:48 +02:00
parent e99bcff8bb
commit 65ec17b621
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/dcraw.cc
View File

@@ -6692,6 +6692,14 @@ void CLASS apply_tiff()
load_raw = &CLASS unpacked_load_raw;
load_flags = 4;
order = 0x4d4d;
} else if ((raw_width * raw_height * 2 * tiff_bps) / 16 == tiff_ifd[raw].bytes) {
// 12 bit uncompressed from Nikon Z7
load_raw = &CLASS packed_load_raw;
} else if ((raw_width * 2 * tiff_bps / 16 + 8) * raw_height == tiff_ifd[raw].bytes) {
// 14 bit uncompressed from Nikon Z7, still wrong
// each line has 8 padding byte. To inform 'packed_load_raw' about his padding, we have to set load_flags = padding << 9
load_flags = 8 << 9;
load_raw = &CLASS packed_load_raw;
} else
load_raw = &CLASS nikon_load_raw; break;
case 65535: