Merge branch 'dev' into release5.4

2018-02-07 14:46:32 +01:00 · 2018-02-07 14:46:32 +01:00 · 37e3cbcc7c
commit 37e3cbcc7c
parent 5236a27f44 12261b5796
1 changed files with 5 additions and 0 deletions
--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@ -126,6 +126,11 @@ inline void ImageDatas::convertTo(unsigned char src, float& dst) const
 {
    dst = src * 257;
 }
+template<>
+inline void ImageDatas::convertTo(float src, float& dst) const
+{
+    dst = std::isnan(src) ? 0.f : src;
+}

 // --------------------------------------------------------------------
 //                       Planar order classes