(no commit message)

[imagemagick] / MagickCore / quantum.h

diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index 719abbc960bd896e2f0798819d4832f1d19bcfdf..6c0b077d49af75482b06ced4b7dcafb6962a73d5 100644 (file)
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -24,8 +24,6 @@ extern "C" {
 
 #include "MagickCore/semaphore.h"
 
-#define RoundToQuantum(quantum)  ClampToQuantum(quantum)
-
 typedef enum
 {
   UndefinedEndian,
@@ -82,15 +80,15 @@ typedef enum
 typedef struct _QuantumInfo
   QuantumInfo;
 
-static inline Quantum ClampToQuantum(const MagickRealType value)
+static inline Quantum ClampToQuantum(const double value)
 {
 #if defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) value);
 #else
   if (value <= 0.0)
     return((Quantum) 0);
-  if (value >= (MagickRealType) QuantumRange)
-    return((Quantum) QuantumRange);
+  if (value >= (double) QuantumRange)
+    return(QuantumRange);
   return((Quantum) (value+0.5));
 #endif
 }
@@ -166,10 +164,10 @@ extern MagickExport QuantumType
   GetQuantumType(Image *,ExceptionInfo *);
 
 extern MagickExport size_t
-  ExportQuantumPixels(Image *,CacheView *,const QuantumInfo *,const QuantumType,
+  ExportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType,
     unsigned char *,ExceptionInfo *),
   GetQuantumExtent(const Image *,const QuantumInfo *,const QuantumType),
-  ImportQuantumPixels(Image *,CacheView *,const QuantumInfo *,const QuantumType,
+  ImportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType,
     const unsigned char *,ExceptionInfo *);
 
 extern MagickExport unsigned char