From abd769165b2af0191c41c68bd348618db474897a Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 10 May 2010 17:24:50 +0000 Subject: [PATCH] --- magick/quantum-private.h | 4 ++-- magick/quantum.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/magick/quantum-private.h b/magick/quantum-private.h index 7b7adbbd4..9e5ce3e87 100644 --- a/magick/quantum-private.h +++ b/magick/quantum-private.h @@ -526,7 +526,7 @@ static inline Quantum ScaleShortToQuantum(const unsigned short value) static inline Quantum ScaleCharToQuantum(const unsigned char value) { #if !defined(MAGICKCORE_HDRI_SUPPORT) - return((Quantum) (MagickULLConstant(72340172838076673)*value)); + return((Quantum) (72340172838076673.0*value+0.5)); #else return((Quantum) (72340172838076673.0*value)); #endif @@ -535,7 +535,7 @@ static inline Quantum ScaleCharToQuantum(const unsigned char value) static inline Quantum ScaleLongToQuantum(const unsigned long value) { #if !defined(MAGICKCORE_HDRI_SUPPORT) - return((Quantum) (4294967295UL*value)); + return((Quantum) (4294967295.0*value+0.5)); #else return((Quantum) (4294967295.0*value)); #endif diff --git a/magick/quantum.h b/magick/quantum.h index b23c31bc4..75b4dfa57 100644 --- a/magick/quantum.h +++ b/magick/quantum.h @@ -137,11 +137,7 @@ static inline unsigned char ScaleQuantumToChar(const Quantum quantum) #elif (MAGICKCORE_QUANTUM_DEPTH == 64) static inline unsigned char ScaleQuantumToChar(const Quantum quantum) { -#if !defined(MAGICKCORE_HDRI_SUPPORT) - return((unsigned char) ((quantum+36170086419038336.0)/72340172838076673.0)); -#else return((unsigned char) (quantum/72340172838076673.0+0.5)); -#endif } #endif -- 2.40.0