From 99c2a78c21bc24e0cbc0fa24241e4c005b442ce1 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 23 Feb 2014 12:28:16 +0000 Subject: [PATCH] --- MagickCore/identify.c | 2 +- MagickCore/statistic.c | 4 ++-- coders/json.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MagickCore/identify.c b/MagickCore/identify.c index 08c5a5e3a..cdcaf0c09 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -393,7 +393,7 @@ static ssize_t PrintChannelPerceptualHash(FILE *file,const ChannelType channel, n=FormatLocaleFile(file," %s:\n",name); for (i=0; i < 7; i++) - n+=FormatLocaleFile(file," %.20g: %.*g, %.*g\n",(double) i, + n+=FormatLocaleFile(file," %.20g: %.*g, %.*g\n",i+1.0, GetMagickPrecision(),channel_phash[channel].P[i], GetMagickPrecision(),channel_phash[channel].Q[i]); return(n); diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index f3d30fff7..42ea5facb 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -1712,7 +1712,7 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash( return((ChannelPerceptualHash *) NULL); for (channel=0; channel <= MaxPixelChannels; channel++) for (i=0; i < 7; i++) - perceptual_hash[channel].P[i]=MagickLog10(moments[channel].I[i]); + perceptual_hash[channel].P[i]=(-MagickLog10(moments[channel].I[i])); moments=(ChannelMoments *) RelinquishMagickMemory(moments); /* Blur then transform to HCLp colorspace. @@ -1742,7 +1742,7 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash( } for (channel=0; channel <= MaxPixelChannels; channel++) for (i=0; i < 7; i++) - perceptual_hash[channel].Q[i]=MagickLog10(moments[channel].I[i]); + perceptual_hash[channel].Q[i]=(-MagickLog10(moments[channel].I[i])); moments=(ChannelMoments *) RelinquishMagickMemory(moments); return(perceptual_hash); } diff --git a/coders/json.c b/coders/json.c index 0f3201a6b..1e4a0c023 100644 --- a/coders/json.c +++ b/coders/json.c @@ -431,11 +431,11 @@ static ssize_t PrintChannelPerceptualHash(FILE *file,const ChannelType channel, n=FormatLocaleFile(file," \"%s\": {\n",name); for (i=0; i < 7; i++) n+=FormatLocaleFile(file, - " \"phash%.20g\": [ \"%.*g\", \"%.*g\" ],\n",(double) i, + " \"phash%.20g\": [ \"%.*g\", \"%.*g\" ],\n",i+1.0, GetMagickPrecision(),channel_phash[channel].P[i], GetMagickPrecision(),channel_phash[channel].Q[i]); n+=FormatLocaleFile(file, - " \"phash%.20g\": [ \"%.*g\", \"%.*g\" ]\n",(double) i, + " \"phash%.20g\": [ \"%.*g\", \"%.*g\" ]\n",i+1.0, GetMagickPrecision(),channel_phash[channel].P[i], GetMagickPrecision(),channel_phash[channel].Q[i]); (void) FormatLocaleFile(file," }"); -- 2.40.0