(no commit message)

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 08c5a5e3ab72b83bc2c7966ffa001c39e9964552..cdcaf0c09c87a5383957ffdca6c2b8ea68d0b5d1 100644 (file)
--- 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 f3d30fff7f1a017d699a07c1aef420c98b03a89f..42ea5facbb4b210791e6c34bee856980f04092fb 100644 (file)
--- 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 0f3201a6b714f2eaae8757183dc0f99d799a9db8..1e4a0c023e0aabd8d6070162008a2d56597d4b4f 100644 (file)
--- 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,"      }");