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

Fix wrong condition which leads to uninitialized memory access for xtrans files, fixes #3156

Browse Source
This commit is contained in:
heckflosse 2016-02-17 18:22:22 +01:00
parent 583dd8ea8c
commit 904467b5a3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/rawimage.cc
View File

@ -88,17 +88,17 @@ void RawImage::get_colorsCoeff( float *pre_mul_, float *scale_mul_, float *cblac
float val; float val;
double dsum[8], dmin, dmax; double dsum[8], dmin, dmax;
if ((this->get_cblack(4) + 1) / 2 == 1 && (this->get_cblack(5) + 1) / 2 == 1) { if(isXtrans()) {
for (int c = 0; c < 4; c++) {
cblack_[FC(c / 2, c % 2)] = this->get_cblack(6 + c / 2 % this->get_cblack(4) * this->get_cblack(5) + c % 2 % this->get_cblack(5));
pre_mul_[c] = this->get_pre_mul(c);
}
} else if(isXtrans()) {
// for xtrans files dcraw stores black levels in cblack[6] .. cblack[41], but all are equal, so we just use cblack[6] // for xtrans files dcraw stores black levels in cblack[6] .. cblack[41], but all are equal, so we just use cblack[6]
for (int c = 0; c < 4; c++) { for (int c = 0; c < 4; c++) {
cblack_[c] = (float) this->get_cblack(6); cblack_[c] = (float) this->get_cblack(6);
pre_mul_[c] = this->get_pre_mul(c); pre_mul_[c] = this->get_pre_mul(c);
} }
} else if ((this->get_cblack(4) + 1) / 2 == 1 && (this->get_cblack(5) + 1) / 2 == 1) {
for (int c = 0; c < 4; c++) {
cblack_[FC(c / 2, c % 2)] = this->get_cblack(6 + c / 2 % this->get_cblack(4) * this->get_cblack(5) + c % 2 % this->get_cblack(5));
pre_mul_[c] = this->get_pre_mul(c);
}
} else { } else {
for (int c = 0; c < 4; c++) { for (int c = 0; c < 4; c++) {
cblack_[c] = (float) this->get_cblack(c); cblack_[c] = (float) this->get_cblack(c);