From: cristy Date: Fri, 26 Feb 2010 02:40:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9917 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75b5a2524fcf8e17a411b92fa09b95a35a172c93;p=imagemagick --- diff --git a/magick/attribute.c b/magick/attribute.c index 9ad6d7be2..d2dd375de 100644 --- a/magick/attribute.c +++ b/magick/attribute.c @@ -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: diff --git a/magick/identify.c b/magick/identify.c index e0bce1059..cd9e4956e 100644 --- a/magick/identify.c +++ b/magick/identify.c @@ -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); }