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

Fix segfault when loading 16-bit float tiff

Browse Source
This commit is contained in:
heckflosse
2018-08-31 13:01:27 +02:00
parent 5d1922ce56
commit 258dfc2275
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/imagefloat.h
View File

@@ -153,7 +153,8 @@ public:
if (exponent == 0) { if (exponent == 0) {
if (mantissa == 0) { if (mantissa == 0) {
// Plus or minus zero // Plus or minus zero
return (uint32_t) (sign << 31); tmp.i = (uint32_t) (sign << 31);
return tmp.f;
} else { } else {
// Denormalized number -- renormalize it // Denormalized number -- renormalize it
while (!(mantissa & 0x00000400)) { while (!(mantissa & 0x00000400)) {
@@ -165,8 +166,9 @@ public:
} }
} else if (exponent == 31) { } else if (exponent == 31) {
if (mantissa == 0) { if (mantissa == 0) {
// Positive or negative infinity, convert to maximum (16 bit) values. // Positive or negative infinity, convert to maximum (16 bit) values.
return (uint32_t) ((sign << 31) | ((0x1eL + 127 - 15) << 23) | (0x3ffL << 13)); tmp.i = (uint32_t)((sign << 31) | ((0x1eL + 127 - 15) << 23) | (0x3ffL << 13));
return tmp.f;
} else { } else {
// Nan -- Just set to zero. // Nan -- Just set to zero.
return 0; return 0;