(no commit message)

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 520181a93b59dd7b0d0dcab961126eeab176271f..db83e6b9b7c6e8b2c90323f6d8f44d479a81f5a2 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1591,9 +1591,9 @@ static inline void ConvertXYZTosRGB(const double x,const double y,
   r=3.1338561*x-1.6168667*y-0.4906146*z;
   g=(-0.9787684*x+1.9161415*y+0.0334540*z);
   b=0.0719453*x-0.2289914*y+1.4052427*z;
-  *red=RoundToQuantum((MagickRealType) QuantumRange*CompandsRGB(r));
-  *green=RoundToQuantum((MagickRealType) QuantumRange*CompandsRGB(g));
-  *blue=RoundToQuantum((MagickRealType) QuantumRange*CompandsRGB(b));
+  *red=ClampToQuantum((MagickRealType) QuantumRange*CompandsRGB(r));
+  *green=ClampToQuantum((MagickRealType) QuantumRange*CompandsRGB(g));
+  *blue=ClampToQuantum((MagickRealType) QuantumRange*CompandsRGB(b));
 }
 
 static inline void ConvertCMYKTosRGB(PixelInfo *pixel)

diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index ce4a0809946eca616a313dc6439ad59b6acc8924..6c0b077d49af75482b06ced4b7dcafb6962a73d5 100644 (file)
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -24,8 +24,6 @@ extern "C" {
 
 #include "MagickCore/semaphore.h"
 
-#define RoundToQuantum(quantum)  ClampToQuantum(quantum)
-
 typedef enum
 {
   UndefinedEndian,

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index c0dfd8eacc85b486230d0734af3dac8d08c03ac0..599bf63ce54724a7a68b39fda7f5e4b0f3afb35f 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -1381,7 +1381,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image,
         threshold=(ssize_t) (QuantumScale*q[i]*(levels[n]*(map->divisor-1)+1));
         level=threshold/(map->divisor-1);
         threshold-=level*(map->divisor-1);
-        q[i]=RoundToQuantum((MagickRealType) (level+(threshold >=
+        q[i]=ClampToQuantum((MagickRealType) (level+(threshold >=
           map->levels[(x % map->width)+map->width*(y % map->height)]))*
           QuantumRange/levels[n]);
         n++;