(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index f211a266e63e4f2aaf35aa91020d7e683df910d5..9c8a5ed62479916861ed58505d87cc294b50f244 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2305,7 +2305,7 @@ if (0)
             break;
           }
         }
-        q[i]=ClampToQuantum(pixel);
+        q[i]=ClampPixel(pixel);
       }
       p+=GetPixelChannels(composite_image);
       channels=GetPixelChannels(composite_image);

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 2b9b0603baf4cab0ff1a6528e74c3c3b6ce5e60c..79ddb725f3447e6c33be3ba8d157f2ffb7581531 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -31,6 +31,19 @@ extern "C" {
 
 #undef index
 
+static inline Quantum ClampPixel(const MagickRealType value)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+  return((Quantum) value);
+#else
+  if (value < 0.0)
+    return((Quantum) 0.0);
+  if (value >= (MagickRealType) QuantumRange)
+    return((Quantum) QuantumRange);
+  return((Quantum) value);
+#endif
+}
+
 static inline Quantum GetPixela(const Image *restrict image,
   const Quantum *restrict pixel)
 {

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 788e33ee60e7bc9d7e3dc1b044588794b78d4adc..459b1a184760e558e6e0213d86225972507b0635 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -685,19 +685,6 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image,
 %
 */
 
-static inline Quantum ClampPixel(const MagickRealType value)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) value);
-#else
-  if (value < 0.0f)
-    return(0.0);
-  if (value >= (MagickRealType) QuantumRange)
-    return((Quantum) QuantumRange);
-  return(value);
-#endif
-}
-
 MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception)
 {
 #define ClampImageTag  "Clamp/Image"

diff --git a/coders/sun.c b/coders/sun.c
index 8f92fc37139b389650e0bef9fe181f2ab74b5d31..af1a7289bfadb11cd416762c1bbbce56c50f368c 100644 (file)
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -337,6 +337,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
       }
     switch (sun_info.maptype)
     {
+      case RMT_NONE:
+        break;
       case RMT_EQUAL_RGB:
       {
         unsigned char