Skip to content

Commit

Permalink
https://github.com/ImageMagick/ImageMagick/issues/1751
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Oct 13, 2019
1 parent 91ae12c commit 8c6e86f
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions magick/quantum-private.h
View file
Expand Up @@ -327,7 +327,7 @@ static inline QuantumAny ScaleQuantumToAny(const Quantum quantum,
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((QuantumAny) ((MagickRealType) range*quantum/QuantumRange));
#else
if (quantum <= 0.0)
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return((QuantumAny) 0UL);
if (((MagickRealType) range*quantum/QuantumRange) >= 18446744073709551615.0)
return((QuantumAny) MagickULLConstant(18446744073709551615));
Expand Down Expand Up @@ -368,8 +368,8 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned int) (16843009UL*quantum));
#else
if (quantum <= 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
if ((16843009.0*quantum) >= 4294967295.0)
return(4294967295UL);
return((unsigned int) (16843009.0*quantum+0.5));
Expand All @@ -383,8 +383,8 @@ static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned int) quantum);
#else
if (quantum < 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
return((unsigned int) (quantum+0.5));
#endif
}
Expand All @@ -394,7 +394,7 @@ static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned short) (257UL*quantum));
#else
if (quantum <= 0.0)
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0);
if ((257.0*quantum) >= 65535.0)
return(65535);
Expand Down Expand Up @@ -447,8 +447,8 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned int) (65537UL*quantum));
#else
if (quantum <= 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
if ((65537.0*quantum) >= 4294967295.0)
return(4294967295U);
return((unsigned int) (65537.0*quantum+0.5));
Expand All @@ -462,8 +462,8 @@ static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned int) quantum);
#else
if (quantum < 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
return((unsigned int) (quantum+0.5));
#endif
}
Expand All @@ -473,7 +473,7 @@ static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned short) quantum);
#else
if (quantum <= 0.0)
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0);
if (quantum >= 65535.0)
return(65535);
Expand Down Expand Up @@ -518,8 +518,8 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
#if !defined(MAGICKCORE_HDRI_SUPPORT)
return((unsigned int) quantum);
#else
if (quantum <= 0.0)
return(0);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
if ((quantum) >= 4294967295.0)
return(4294967295);
return((unsigned int) (quantum+0.5));
Expand All @@ -528,8 +528,8 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)

static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
{
if (quantum < 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
if ((quantum/65537) >= (Quantum) MaxMap)
return((unsigned int) MaxMap);
#if !defined(MAGICKCORE_HDRI_SUPPORT)
Expand All @@ -546,7 +546,7 @@ static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
return((unsigned short) ((quantum+MagickULLConstant(32768))/
MagickULLConstant(65537)));
#else
if (quantum <= 0.0)
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0);
if ((quantum/65537.0) >= 65535.0)
return(65535);
Expand Down Expand Up @@ -589,16 +589,16 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)

static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
{
if (quantum <= 0.0)
return(0UL);
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0U);
if ((quantum/281479271743489.0) >= MaxMap)
return((unsigned int) MaxMap);
return((unsigned int) (quantum/281479271743489.0+0.5));
}

static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
{
if (quantum <= 0.0)
if ((IsNaN(quantum) != MagickFalse) || (quantum <= 0.0))
return(0);
if ((quantum/281479271743489.0) >= 65535.0)
return(65535);
Expand Down

0 comments on commit 8c6e86f

Please sign in to comment.