]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 26 Feb 2010 02:40:46 +0000 (02:40 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 26 Feb 2010 02:40:46 +0000 (02:40 +0000)
magick/attribute.c
magick/identify.c

index 9ad6d7be21c01070b32f254e693202109ee68239..d2dd375de1b5be3421c656d3c5ed286404fd4162 100644 (file)
@@ -743,8 +743,6 @@ MagickExport MagickBooleanType IsMonochromeImage(const Image *image,
           break;
       }
       image_view=DestroyCacheView(image_view);
-      if (y == (long) image->rows)
-        ((Image *) image)->type=BilevelType;
       break;
     }
     case PseudoClass:
index e0bce1059e267f4aab6d94554ba303df1fd75504..cd9e4956e9067faf316cea3ef1876ccdd09d4d26 100644 (file)
@@ -218,13 +218,12 @@ static int PrintChannelStatistics(FILE *file,const ChannelType channel,
       maxima=QuantumRange-maxima;
       mean=QuantumRange-mean;
     }
-  status=fprintf(file,StatisticsFormat,name,(Quantum) (scale*minima),minima/
-    (double) QuantumRange,(Quantum) (maxima/scale),maxima/(double) QuantumRange,
-    scale*mean,mean/(double) QuantumRange,
-    scale*channel_statistics[channel].standard_deviation,
-    channel_statistics[channel].standard_deviation/(double)
-    QuantumRange,channel_statistics[channel].kurtosis,
-    channel_statistics[channel].skewness);
+  status=fprintf(file,StatisticsFormat,name,(Quantum) (scale*minima+0.5),minima/
+    (double) QuantumRange,(Quantum) (scale*maxima+0.5),maxima/(double)
+    QuantumRange,scale*mean,mean/(double) QuantumRange,scale*
+    channel_statistics[channel].standard_deviation,
+    channel_statistics[channel].standard_deviation/(double) QuantumRange,
+    channel_statistics[channel].kurtosis,channel_statistics[channel].skewness);
   return(status);
 }