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

Whean read, 32 bits tiff image data are not scaled anymore

Browse Source 
So the highlights above the 1.0 upper limit will be clipped but colors
will be preserved. Fix #4379
This commit is contained in:
Hombre 2018-02-09 22:25:40 +01:00
parent 786b73b899
commit d7f7c06f10
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/imagefloat.cc
View File

@ -57,35 +57,38 @@ void Imagefloat::setScanline (int row, unsigned char* buffer, int bps, float *mi
float* sbuffer = (float*) buffer;
for (int i = 0; i < width; i++) {
r(row, i) = sbuffer[ix];
r(row, i) = 65535.f * sbuffer[ix];
if (minValue) {
if (sbuffer[ix] < minValue[0]) {
minValue[0] = sbuffer[ix];
} else if (sbuffer[ix] > maxValue[0]) {
maxValue[0] = sbuffer[ix];
} ++ix;
}
}
++ix;
g(row, i) = sbuffer[ix];
g(row, i) = 65535.f * sbuffer[ix];
if (minValue) {
if (sbuffer[ix] < minValue[1]) {
minValue[1] = sbuffer[ix];
} else if (sbuffer[ix] > maxValue[1]) {
maxValue[1] = sbuffer[ix];
} ++ix;
}
}
++ix;
b(row, i) = sbuffer[ix];
b(row, i) = 65535.f * sbuffer[ix];
if (minValue) {
if (sbuffer[ix] < minValue[2]) {
minValue[2] = sbuffer[ix];
} else if (sbuffer[ix] > maxValue[2]) {
maxValue[2] = sbuffer[ix];
} ++ix;
}
}
++ix;
}
break;

23
rtengine/imageio.cc
View File

@ -835,7 +835,6 @@ int ImageIO::loadTIFF (Glib::ustring fname)
allocate (width, height);
float minValue[3] = {0.f, 0.f, 0.f}, maxValue[3] = {0.f, 0.f, 0.f};
unsigned char* linebuffer = new unsigned char[TIFFScanlineSize(in) * (samplesperpixel == 1 ? 3 : 1)];
for (int row = 0; row < height; row++) {
@ -861,33 +860,13 @@ int ImageIO::loadTIFF (Glib::ustring fname)
}
}
if (sampleFormat & (IIOSF_LOGLUV24 | IIOSF_LOGLUV32 | IIOSF_FLOAT)) {
setScanline (row, linebuffer, bitspersample, minValue, maxValue);
} else {
setScanline (row, linebuffer, bitspersample, nullptr, nullptr);
}
setScanline (row, linebuffer, bitspersample, nullptr, nullptr);
if (pl && !(row % 100)) {
pl->setProgress ((double)(row + 1) / height);
}
}
if (sampleFormat & (IIOSF_FLOAT | IIOSF_LOGLUV24 | IIOSF_LOGLUV32)) {
#ifdef _DEBUG
if (options.rtSettings.verbose)
printf("Normalizing \"%s\" image \"%s\" whose mini/maxi values are:\n Red: minimum value=%0.5f / maximum value=%0.5f\n Green: minimum value=%0.5f / maximum value=%0.5f\n Blue: minimum value=%0.5f / maximum value=%0.5f\n",
getType(), fname.c_str(),
minValue[0], maxValue[0], minValue[1],
maxValue[1], minValue[2], maxValue[2]
);
#endif
float minVal = rtengine::min(minValue[0], minValue[1], minValue[2]);
float maxVal = rtengine::max(maxValue[0], maxValue[1], maxValue[2]);
normalizeFloat(minVal, maxVal);
}
TIFFClose(in);
delete [] linebuffer;