(no commit message)

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 24509fa8517a1e7357bb011198f05a0e1657a0f3..6b11ddc958f2a5742567f627cbb7a53b0e026a92 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -341,7 +341,7 @@ Magick::Quantum Magick::Color::scaleDoubleToQuantum(const double double_)
 
 double Magick::Color::scaleQuantumToDouble(const Magick::Quantum quantum_)
 {
-#if (MAGICKCORE_QUANTUM_DEPTH != 64)
+#if (MAGICKCORE_QUANTUM_DEPTH < 32)
   return (static_cast<double>(quantum_)/QuantumRange);
 #else
   return (quantum_/QuantumRange);
@@ -733,4 +733,4 @@ void Magick::ColorYUV::convert(const double y_,const double u_,const double v_)
 Magick::ColorYUV::ColorYUV(PixelInfo *rep_,PixelType pixelType_)
   : Color(rep_,pixelType_)
 {
-}
\ No newline at end of file
+}

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 6ea55bc3f3d6817fe26c92e0e3c142bce9e5895b..31dfefe9867d4f236bf0868663f87ef9441d306a 100644 (file)
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -77,7 +77,7 @@ typedef unsigned short Quantum;
 typedef float_t MagickRealType;
 
 #if defined(MAGICKCORE_HDRI_SUPPORT)
-typedef float Quantum;
+typedef double Quantum;
 #define QuantumRange  4294967295.0
 #define QuantumFormat  "%g"
 #else
@@ -91,7 +91,7 @@ typedef unsigned int Quantum;
 #define MaxMap  65535UL
 
 typedef long double MagickRealType;
-typedef double_t Quantum;
+typedef long double Quantum;
 #define QuantumRange  18446744073709551615.0
 #define QuantumFormat  "%g"
 #else