From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 21 Jul 2018 13:27:39 +0000 (-0400)
Subject: ScaleQuantumToLongLong(ScaleLongLongToQuantum(X)) returns X as expected
X-Git-Tag: 7.0.8-8~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4bdde2f8aae8785d6bc3acc20b2ea29bca9328b;p=imagemagick

ScaleQuantumToLongLong(ScaleLongLongToQuantum(X)) returns X as expected
---

diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index baea59398..178182bad 100644
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -387,7 +387,7 @@ static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
     return(0UL);
   if ((551911719039.0*quantum) >= 18446744073709551615.0)
     return(MagickULLConstant(18446744073709551615));
-  return((MagickSizeType) (1103823438079.0*quantum+0.5));
+  return((MagickSizeType) (551911719039.0*quantum+0.5));
 #endif
 }
 
@@ -482,13 +482,13 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
 static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((MagickSizeType) (MagickULLConstant(16842752)*quantum));
+  return((MagickSizeType) (MagickULLConstant(65537)*quantum));
 #else
   if (quantum <= 0.0)
     return(0UL);
   if ((65537.0*quantum) >= 18446744073709551615.0)
     return(MagickULLConstant(18446744073709551615));
-  return((MagickSizeType) (16842752.0*quantum+0.5));
+  return((MagickSizeType) (65537.0*quantum+0.5));
 #endif
 }