Revert color patch

ImageMagick · Nov 8, 2015 · d605482 · d605482
1 parent 53b32e5
commit d605482
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/magick/color.c b/magick/color.c
@@ -2770,19 +2770,19 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
             scale=(MagickRealType) (QuantumRange/100.0);
           if ((flags & RhoValue) != 0)
             color->red=(MagickRealType) ClampToQuantum((MagickRealType)
-              floor(scale*geometry_info.rho));
+              (scale*geometry_info.rho));
           if ((flags & SigmaValue) != 0)
             color->green=(MagickRealType) ClampToQuantum((MagickRealType)
-              floor(scale*geometry_info.sigma));
+              (scale*geometry_info.sigma));
           if ((flags & XiValue) != 0)
             color->blue=(MagickRealType) ClampToQuantum((MagickRealType)
-              floor(scale*geometry_info.xi));
+              (scale*geometry_info.xi));
           color->opacity=(MagickRealType) OpaqueOpacity;
           if ((flags & PsiValue) != 0)
             {
               if (color->colorspace == CMYKColorspace)
                 color->index=(MagickRealType) ClampToQuantum((MagickRealType)
-                  floor(scale*geometry_info.psi));
+                  (scale*geometry_info.psi));
               else
                 if (color->matte != MagickFalse)
                   color->opacity=(MagickRealType) ClampToQuantum(
@@ -2796,10 +2796,10 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
             {
               if ((flags & SigmaValue) != 0)
                 color->green=(MagickRealType) ClampToQuantum((MagickRealType)
-                  floor(scale*geometry_info.sigma+(QuantumRange+1)/2.0));
+                  (scale*geometry_info.sigma+(QuantumRange+1)/2.0));
               if ((flags & XiValue) != 0)
                 color->blue=(MagickRealType) ClampToQuantum((MagickRealType)
-                  floor(scale*geometry_info.xi+(QuantumRange+1)/2.0));
+                  (scale*geometry_info.xi+(QuantumRange+1)/2.0));
             }
           if (LocaleCompare(colorspace,"gray") == 0)
             {

diff --git a/magick/identify.c b/magick/identify.c
@@ -458,10 +458,10 @@ static ssize_t PrintChannelStatistics(FILE *file,const ChannelType channel,
   if (channel == AlphaChannel)
     {
       n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum(
-        (MagickRealType) floor(scale*(QuantumRange-
+        (MagickRealType) (scale*(QuantumRange-
         channel_statistics[channel].maxima))),(QuantumRange-
         channel_statistics[channel].maxima)/(double) QuantumRange,
-        ClampToQuantum((MagickRealType) floor(scale*(QuantumRange-
+        ClampToQuantum((MagickRealType) (scale*(QuantumRange-
         channel_statistics[channel].minima))),(QuantumRange-
         channel_statistics[channel].minima)/(double) QuantumRange,
         scale*(QuantumRange-channel_statistics[channel].mean),(QuantumRange-
@@ -474,7 +474,7 @@ static ssize_t PrintChannelStatistics(FILE *file,const ChannelType channel,
       return(n);
     }
   n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum((MagickRealType)
-    floor(scale*channel_statistics[channel].minima)),
+    (scale*channel_statistics[channel].minima)),
     channel_statistics[channel].minima/(double) QuantumRange,ClampToQuantum(
     (MagickRealType) (scale*channel_statistics[channel].maxima)),
     channel_statistics[channel].maxima/(double) QuantumRange,scale*