From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 6 Apr 2012 18:09:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5885
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=610b5aaa751e168a5b034d5924314d41238ff2f2;p=imagemagick

---

diff --git a/MagickCore/draw.h b/MagickCore/draw.h
index b286df5d7..4100dde49 100644
--- a/MagickCore/draw.h
+++ b/MagickCore/draw.h
@@ -139,7 +139,7 @@ typedef struct _StopInfo
   PixelInfo
     color;
 
-  MagickRealType
+  double
     offset;
 } StopInfo;
 
@@ -172,7 +172,7 @@ typedef struct _GradientInfo
   PointInfo
     center;
 
-  MagickRealType
+  double
     radius;
 } GradientInfo;
 
diff --git a/MagickCore/morphology.h b/MagickCore/morphology.h
index 67d0c5a15..3c942e12a 100644
--- a/MagickCore/morphology.h
+++ b/MagickCore/morphology.h
@@ -111,10 +111,8 @@ typedef struct _KernelInfo
     x,
     y;
 
-  MagickRealType
-    *values;
-
   double
+    *values,
     minimum,
     maximum,
     negative_range,
diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index bab1ef04b..78d9bcc31 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -292,23 +292,23 @@ static inline PixelTrait GetPixelRedTraits(const Image *restrict image)
 static inline void GetPixelInfoPixel(const Image *restrict image,
   const Quantum *restrict pixel,PixelInfo *restrict pixel_info)
 {
-  pixel_info->red=(MagickRealType)
+  pixel_info->red=(double)
     pixel[image->channel_map[RedPixelChannel].offset];
-  pixel_info->green=(MagickRealType)
+  pixel_info->green=(double)
     pixel[image->channel_map[GreenPixelChannel].offset];
-  pixel_info->blue=(MagickRealType)
+  pixel_info->blue=(double)
     pixel[image->channel_map[BluePixelChannel].offset];
   pixel_info->black=0;
   if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->black=(MagickRealType)
+    pixel_info->black=(double)
       pixel[image->channel_map[BlackPixelChannel].offset];
   pixel_info->alpha=OpaqueAlpha;
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->alpha=(MagickRealType)
+    pixel_info->alpha=(double)
       pixel[image->channel_map[AlphaPixelChannel].offset];
   pixel_info->index=0;
   if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait)
-    pixel_info->index=(MagickRealType)
+    pixel_info->index=(double)
       pixel[image->channel_map[IndexPixelChannel].offset];
 }
 
diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index 6abfc5a6e..da20ae92d 100644
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -82,14 +82,14 @@ 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)
+  if (value >= (double) QuantumRange)
     return((Quantum) QuantumRange);
   return((Quantum) (value+0.5));
 #endif