Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2021-01-13 16:20:26 +0300
committerSergey Sharybin <sergey@blender.org>2021-01-14 16:54:08 +0300
commit53bd58993e2f6d35452242762402c20343d6eef3 (patch)
tree7fd33ab1a6ed49fbdfbee16843bf9e5e2f829853 /source/blender/imbuf
parent74f6b81c12c3c137a05eb0051d75821c11a30c11 (diff)
Fix T84167: Saving half-float EXR might result in NaN pixels
Clamp value to the -HALF_MAX .. HALF_MAX. The non-clamped values were causing NaN and inf values saved to the file, which was the root cause of glare node giving unexpected result. The nan/inf on overflow is something mentioned in the half data type in OpenEXR header. Differential Revision: https://developer.blender.org/D10105
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/openexr/openexr_api.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 9726eaeed2c..979e7703e81 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -324,6 +324,11 @@ struct _RGBAZ {
using RGBAZ = _RGBAZ;
+static half float_to_half_safe(const float value)
+{
+ return half(clamp_f(value, -HALF_MAX, HALF_MAX));
+}
+
extern "C" {
/**
@@ -472,10 +477,10 @@ static bool imb_save_openexr_half(ImBuf *ibuf, const char *name, const int flags
from = ibuf->rect_float + channels * i * width;
for (int j = ibuf->x; j > 0; j--) {
- to->r = from[0];
- to->g = (channels >= 2) ? from[1] : from[0];
- to->b = (channels >= 3) ? from[2] : from[0];
- to->a = (channels >= 4) ? from[3] : 1.0f;
+ to->r = float_to_half_safe(from[0]);
+ to->g = float_to_half_safe((channels >= 2) ? from[1] : from[0]);
+ to->b = float_to_half_safe((channels >= 3) ? from[2] : from[0]);
+ to->a = float_to_half_safe((channels >= 4) ? from[3] : 1.0f);
to++;
from += channels;
}
@@ -1116,7 +1121,7 @@ void IMB_exr_write_channels(void *handle)
float *rect = echan->rect;
half *cur = current_rect_half;
for (size_t i = 0; i < num_pixels; i++, cur++) {
- *cur = rect[i * echan->xstride];
+ *cur = float_to_half_safe(rect[i * echan->xstride]);
}
half *rect_to_write = current_rect_half + (data->height - 1L) * data->width;
frameBuffer.insert(