From: cristy Date: Fri, 9 Jan 2015 20:08:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1468 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=741129f3dda4997137082243eb18023e1bb5e284;p=imagemagick --- diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 79ddb725f..2b9b0603b 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -31,19 +31,6 @@ extern "C" { #undef index -static inline Quantum ClampPixel(const MagickRealType value) -{ -#if !defined(MAGICKCORE_HDRI_SUPPORT) - return((Quantum) value); -#else - if (value < 0.0) - return((Quantum) 0.0); - if (value >= (MagickRealType) QuantumRange) - return((Quantum) QuantumRange); - return((Quantum) value); -#endif -} - static inline Quantum GetPixela(const Image *restrict image, const Quantum *restrict pixel) { diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h index 763e4be7e..43ba82fa2 100644 --- a/MagickCore/pixel-private.h +++ b/MagickCore/pixel-private.h @@ -22,6 +22,19 @@ extern "C" { #endif +static inline Quantum ClampPixel(const MagickRealType value) +{ +#if !defined(MAGICKCORE_HDRI_SUPPORT) + return((Quantum) value); +#else + if (value < 0.0) + return((Quantum) 0.0); + if (value >= (MagickRealType) QuantumRange) + return((Quantum) QuantumRange); + return((Quantum) value); +#endif +} + static inline double PerceptibleReciprocal(const double x) { double diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 459b1a184..ed27bf3fd 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -69,6 +69,7 @@ #include "MagickCore/montage.h" #include "MagickCore/option.h" #include "MagickCore/pixel-accessor.h" +#include "MagickCore/pixel-private.h" #include "MagickCore/quantize.h" #include "MagickCore/quantum.h" #include "MagickCore/random_.h"