From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Mon, 26 Feb 2018 22:04:33 +0000 (+0100)
Subject: Fixed incorrect rounding when HDRI is enabled.
X-Git-Tag: 7.0.7-25~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a599a38182aabc05b695588fa5f0a805d52666cc;p=imagemagick

Fixed incorrect rounding when HDRI is enabled.
---

diff --git a/MagickCore/accelerate-kernels-private.h b/MagickCore/accelerate-kernels-private.h
index 4b5d942f3..6b209550b 100644
--- a/MagickCore/accelerate-kernels-private.h
+++ b/MagickCore/accelerate-kernels-private.h
@@ -303,13 +303,17 @@ OPENCL_ELIF((MAGICKCORE_QUANTUM_DEPTH == 32))
 
 OPENCL_ENDIF()
 
+OPENCL_IF((MAGICKCORE_HDRI_SUPPORT == 1))
+
   STRINGIFY(
-    inline int ClampToCanvas(const int offset,const int range)
+    inline CLQuantum ClampToQuantum(const float value)
       {
-        return clamp(offset, (int)0, range-1);
+        return (CLQuantum) value;
       }
   )
 
+OPENCL_ELSE()
+
   STRINGIFY(
     inline CLQuantum ClampToQuantum(const float value)
       {
@@ -317,6 +321,15 @@ OPENCL_ENDIF()
       }
   )
 
+OPENCL_ENDIF()
+
+  STRINGIFY(
+    inline int ClampToCanvas(const int offset,const int range)
+      {
+        return clamp(offset, (int)0, range-1);
+      }
+  )
+
   STRINGIFY(
     inline uint ScaleQuantumToMap(CLQuantum value)
       {