From 9355037fe81ca71f07774ae50136c654163477d5 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 2 Jun 2012 15:18:57 +0000 Subject: [PATCH] --- MagickCore/magick-type.h | 8 ++++---- MagickCore/pixel-private.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h index a03672052..1459685bf 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -37,7 +37,7 @@ extern "C" { #endif #if (MAGICKCORE_QUANTUM_DEPTH == 8) -#define MagickEpsilon 1.0e-6 +#define MagickEpsilon ((MagickRealType) 1.0e-6) #define MaxColormapSize 256UL #define MaxMap 255UL @@ -56,7 +56,7 @@ typedef unsigned char Quantum; #define QuantumFormat "%u" #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 16) -#define MagickEpsilon 1.0e-10 +#define MagickEpsilon ((MagickRealType) 1.0e-10) #define MaxColormapSize 65536UL #define MaxMap 65535UL @@ -75,7 +75,7 @@ typedef unsigned short Quantum; #define QuantumFormat "%u" #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 32) -#define MagickEpsilon 1.0e-10 +#define MagickEpsilon ((MagickRealType) 1.0e-10) #define MaxColormapSize 65536UL #define MaxMap 65535UL @@ -90,7 +90,7 @@ typedef unsigned int Quantum; #define QuantumFormat "%u" #endif #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER) -#define MagickEpsilon 1.0e-10 +#define MagickEpsilon ((MagickRealType) 1.0e-10) #define MaxColormapSize 65536UL #define MaxMap 65535UL diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h index 255cc1f71..58dc51114 100644 --- a/MagickCore/pixel-private.h +++ b/MagickCore/pixel-private.h @@ -31,8 +31,7 @@ static inline MagickRealType AlphaReciprocal(const MagickRealType alpha) Reciprocal alpha: clamp to [MagickEpsilon,1], return reciprocal. */ beta=(alpha > (MagickRealType) 1.0 ? (MagickRealType) 1.0 : alpha); - beta=(beta < (MagickRealType) MagickEpsilon ? (MagickRealType) - MagickEpsilon : beta); + beta=(beta < MagickEpsilon ? MagickEpsilon : beta); return((MagickRealType) 1.0/beta); } -- 2.40.0