From 067638f702a3e35c44bcc3ba9593c1e24951a781 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 8 Aug 2014 14:35:02 +0000 Subject: [PATCH] --- Magick++/lib/Color.cpp | 4 ++-- MagickCore/magick-type.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp index 24509fa85..6b11ddc95 100644 --- 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(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 6ea55bc3f..31dfefe98 100644 --- 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 -- 2.50.1