commit ce70c17bb6433add2eb069515a4f3105989e0662
author cristy <urban-warrior@git.imagemagick.org> Thu Jan 07 17:15:30 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Jan 07 17:15:30 2010 +0000
tree 28bed81ec26ded3222606e685e708a5278a13c44
parent 9a727815c452f91fecff573d07145f1a297f1531

wand/pixel-wand.c

diff --git a/wand/pixel-wand.c b/wand/pixel-wand.c
index a6eaf8b..21f2c16 100644
--- a/wand/pixel-wand.c
+++ b/wand/pixel-wand.c
@@ -548,7 +548,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return((Quantum) QuantumRange-RoundToQuantum(wand->pixel.opacity));
+  return((Quantum) QuantumRange-ClampToQuantum(wand->pixel.opacity));
 }
 
 /*
@@ -610,7 +610,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.index));
+  return(ClampToQuantum(wand->pixel.index));
 }
 
 /*
@@ -672,7 +672,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.blue));
+  return(ClampToQuantum(wand->pixel.blue));
 }
 
 /*
@@ -850,7 +850,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.red));
+  return(ClampToQuantum(wand->pixel.red));
 }
 
 /*
@@ -1031,7 +1031,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.green));
+  return(ClampToQuantum(wand->pixel.green));
 }
 
 /*
@@ -1067,8 +1067,8 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  ConvertRGBToHSL(RoundToQuantum(wand->pixel.red),RoundToQuantum(
-    wand->pixel.green),RoundToQuantum(wand->pixel.blue),hue,saturation,
+  ConvertRGBToHSL(ClampToQuantum(wand->pixel.red),ClampToQuantum(
+    wand->pixel.green),ClampToQuantum(wand->pixel.blue),hue,saturation,
     lightness);
 }
 
@@ -1162,7 +1162,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.green));
+  return(ClampToQuantum(wand->pixel.green));
 }
 
 /*
@@ -1259,7 +1259,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.opacity));
+  return(ClampToQuantum(wand->pixel.opacity));
 }
 
 /*
@@ -1293,20 +1293,20 @@
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   assert(color != (PixelPacket *) NULL);
-  color->opacity=RoundToQuantum(wand->pixel.opacity);
+  color->opacity=ClampToQuantum(wand->pixel.opacity);
   if (wand->pixel.colorspace == CMYKColorspace)
     {
-      color->red=RoundToQuantum((MagickRealType) QuantumRange-
+      color->red=ClampToQuantum((MagickRealType) QuantumRange-
         (wand->pixel.red*(QuantumRange-wand->pixel.index)+wand->pixel.index));
-      color->green=RoundToQuantum((MagickRealType) QuantumRange-
+      color->green=ClampToQuantum((MagickRealType) QuantumRange-
         (wand->pixel.green*(QuantumRange-wand->pixel.index)+wand->pixel.index));
-      color->blue=RoundToQuantum((MagickRealType) QuantumRange-
+      color->blue=ClampToQuantum((MagickRealType) QuantumRange-
         (wand->pixel.blue*(QuantumRange-wand->pixel.index)+wand->pixel.index));
       return;
     }
-  color->red=RoundToQuantum(wand->pixel.red);
-  color->green=RoundToQuantum(wand->pixel.green);
-  color->blue=RoundToQuantum(wand->pixel.blue);
+  color->red=ClampToQuantum(wand->pixel.red);
+  color->green=ClampToQuantum(wand->pixel.green);
+  color->blue=ClampToQuantum(wand->pixel.blue);
 }
 
 /*
@@ -1368,7 +1368,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.red));
+  return(ClampToQuantum(wand->pixel.red));
 }
 
 /*
@@ -1430,7 +1430,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  return(RoundToQuantum(wand->pixel.blue));
+  return(ClampToQuantum(wand->pixel.blue));
 }
 
 /*
@@ -1465,7 +1465,7 @@
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   wand->pixel.opacity=(MagickRealType) (QuantumRange-
-    RoundToQuantum((MagickRealType) QuantumRange*alpha));
+    ClampToQuantum((MagickRealType) QuantumRange*alpha));
 }
 
 /*
@@ -1532,7 +1532,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.index=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.index=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*black);
 }
 
@@ -1599,7 +1599,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.blue=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.blue=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*blue);
 }
 
@@ -1776,7 +1776,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.red=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.red=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*cyan);
 }
 
@@ -1876,7 +1876,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.green=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.green=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*green);
 }
 
@@ -2020,7 +2020,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.green=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.green=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*magenta);
 }
 
@@ -2124,7 +2124,7 @@
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   wand->pixel.matte=MagickTrue;
-  wand->pixel.opacity=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.opacity=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*opacity);
 }
 
@@ -2230,7 +2230,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.red=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.red=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*red);
 }
 
@@ -2297,7 +2297,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  wand->pixel.blue=(MagickRealType) RoundToQuantum((MagickRealType)
+  wand->pixel.blue=(MagickRealType) ClampToQuantum((MagickRealType)
     QuantumRange*yellow);
 }