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-26 14:59:08 +02:00
parent 34594d357f 4511b693e1
commit 1062869d01
73 changed files with 1381 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtengine/rawimage.cc
View File

@@ -333,10 +333,16 @@ skip_block:
pre_mul_[3] = pre_mul_[1] = (pre_mul_[3] + pre_mul_[1]) / 2;
}
if (colors == 1)
if (colors == 1) {
// there are monochrome cameras with wrong matrix. We just replace with this one.
rgb_cam[0][0] = 1; rgb_cam[1][0] = 0; rgb_cam[2][0] = 0;
rgb_cam[0][1] = 0; rgb_cam[1][1] = 1; rgb_cam[2][1] = 0;
rgb_cam[0][2] = 0; rgb_cam[1][2] = 0; rgb_cam[2][2] = 1;
for (c = 1; c < 4; c++) {
cblack_[c] = cblack_[0];
}
}
bool multiple_whites = false;
int largest_white = this->get_white(0);
@@ -455,7 +461,11 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
}
if (!strcmp(make, "Fujifilm") && raw_height * raw_width * 2u != raw_size) {
parse_fuji_compressed_header();
if (raw_width * raw_height * 7 / 4 == raw_size) {
load_raw = &RawImage::fuji_14bit_load_raw;
} else {
parse_fuji_compressed_header();
}
}
if (flip == 5) {