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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-03-27 17:18:32 +02:00
parent 75fb5a697e c9fa7b055c
commit c74cdb922f
16 changed files with 275 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawimage.cc
View File

@@ -461,7 +461,7 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
}
if (!strcmp(make, "Fujifilm") && raw_height * raw_width * 2u != raw_size) {
if (raw_width * raw_height * 7 / 4 == raw_size) {
if (raw_width * raw_height * 7u / 4u == raw_size) {
load_raw = &RawImage::fuji_14bit_load_raw;
} else {
parse_fuji_compressed_header();