From 6486e1e943d31c0d93e6e9cfdf188908472380aa Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 13 Sep 2017 07:14:10 -0400
Subject: [PATCH]
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32689
---
MagickCore/identify.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 623e8a8fa..553de0a58 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -440,23 +440,28 @@ static ssize_t PrintChannelStatistics(FILE *file,const PixelChannel channel,
const char *name,const double scale,
const ChannelStatistics *channel_statistics)
{
-#define StatisticsFormat " %s:\n min: " QuantumFormat \
- " (%g)\n max: " QuantumFormat " (%g)\n" \
- " mean: %g (%g)\n standard deviation: %g (%g)\n" \
- " kurtosis: %g\n skewness: %g\n entropy: %g\n"
+#define StatisticsFormat " %s:\n min: %*g (%*g)\n " \
+ "max: %*g (%*g)\n mean: %*g (%*g)\n " \
+ "standard deviation: %*g (%*g)\n kurtosis: %*g\n " \
+ "skewness: %*g\n entropy: %*g\n"
ssize_t
n;
- n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum((MagickRealType)
- (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*
- channel_statistics[channel].mean,channel_statistics[channel].mean/(double)
- QuantumRange,scale*channel_statistics[channel].standard_deviation,
- channel_statistics[channel].standard_deviation/(double) QuantumRange,
- channel_statistics[channel].kurtosis,channel_statistics[channel].skewness,
+ n=FormatLocaleFile(file,StatisticsFormat,name,GetMagickPrecision(),
+ (double) ClampToQuantum((MagickRealType) (scale*
+ channel_statistics[channel].minima)),GetMagickPrecision(),
+ channel_statistics[channel].minima/(double) QuantumRange,
+ GetMagickPrecision(),(double) ClampToQuantum((MagickRealType) (scale*
+ channel_statistics[channel].maxima)),GetMagickPrecision(),
+ channel_statistics[channel].maxima/(double) QuantumRange,
+ GetMagickPrecision(),scale*channel_statistics[channel].mean,
+ GetMagickPrecision(),channel_statistics[channel].mean/(double) QuantumRange,
+ GetMagickPrecision(),scale*channel_statistics[channel].standard_deviation,
+ GetMagickPrecision(),channel_statistics[channel].standard_deviation/
+ (double) QuantumRange,GetMagickPrecision(),
+ channel_statistics[channel].kurtosis,GetMagickPrecision(),
+ channel_statistics[channel].skewness,GetMagickPrecision(),
channel_statistics[channel].entropy);
return(n);
}
--
2.40.0