From bb9815fbfd5fc05bee8dbe1fef32fec93ff8f51f Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 23 Aug 2012 11:51:47 +0000 Subject: [PATCH] --- MagickCore/magick-type.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index 757ebb0a1..ac7b9da0e 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -39,6 +39,8 @@ extern "C" { #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MaxColormapSize 256UL #define MaxMap 255UL +typedef float MagickRealType; +typedef ssize_t SignedQuantum; #if defined(MAGICKCORE_HDRI_SUPPORT) typedef float Quantum; @@ -52,6 +54,8 @@ typedef unsigned char Quantum; #elif (MAGICKCORE_QUANTUM_DEPTH == 16) #define MaxColormapSize 65536UL #define MaxMap 65535UL +typedef float MagickRealType; +typedef ssize_t SignedQuantum; #if defined(MAGICKCORE_HDRI_SUPPORT) typedef float Quantum; @@ -65,6 +69,8 @@ typedef unsigned short Quantum; #elif (MAGICKCORE_QUANTUM_DEPTH == 32) #define MaxColormapSize 65536UL #define MaxMap 65535UL +typedef double MagickRealType; +typedef double SignedQuantum; #if defined(MAGICKCORE_HDRI_SUPPORT) typedef float Quantum; @@ -78,6 +84,8 @@ typedef unsigned int Quantum; #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER) #define MaxColormapSize 65536UL #define MaxMap 65535UL +typedef long double MagickRealType; +typedef double SignedQuantum; typedef double Quantum; #define QuantumRange 18446744073709551615.0 @@ -121,14 +129,6 @@ typedef MagickOffsetType QuantumAny; typedef MagickSizeType QuantumAny; #endif -#if QuantumDepth > 16 - typedef double MagickRealType; - typedef double SignedQuantum; -#else - typedef float MagickRealType; - typedef ssize_t SignedQuantum; -#endif - #if defined(macintosh) #define ExceptionInfo MagickExceptionInfo #endif -- 2.50.1