(no commit message)

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index a5c6c1fb7d43e587dca7f6f14fa5d2db4a73abcd..e30b4ecc566e24d68c617fa755479e69eaeb4856 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1160,8 +1160,8 @@ static MagickBooleanType GetPerceptualHashDistortion(const Image *image,
         alpha,
         beta;
 
-      alpha=image_phash[channel].P[i];
-      beta=reconstruct_phash[channel].P[i];
+      alpha=image_phash[channel].srgb_moment[i];
+      beta=reconstruct_phash[channel].srgb_moment[i];
       difference+=(beta-alpha)*(beta-alpha);
     }
     distortion[channel]+=difference;
@@ -1191,8 +1191,8 @@ static MagickBooleanType GetPerceptualHashDistortion(const Image *image,
         alpha,
         beta;
 
-      alpha=image_phash[channel].Q[i];
-      beta=reconstruct_phash[channel].Q[i];
+      alpha=image_phash[channel].hclp_moment[i];
+      beta=reconstruct_phash[channel].hclp_moment[i];
       difference+=(beta-alpha)*(beta-alpha);
     }
     distortion[channel]+=difference;

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 9db3d138d8129d795f2898b745fd503765c47351..69fc6d4a86d2fd0cfe3e8431a63343232bc10765 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -394,8 +394,8 @@ static ssize_t PrintChannelPerceptualHash(FILE *file,const PixelChannel channel,
   n=FormatLocaleFile(file,"    %s:\n",name);
   for (i=0; i < 7; i++)
     n+=FormatLocaleFile(file,"      PH%.20g: %.*g, %.*g\n",i+1.0,
-      GetMagickPrecision(),channel_phash[channel].P[i],
-      GetMagickPrecision(),channel_phash[channel].Q[i]);
+      GetMagickPrecision(),channel_phash[channel].srgb_moment[i],
+      GetMagickPrecision(),channel_phash[channel].hclp_moment[i]);
   return(n);
 }
 

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 4bb3508bcda0fa8221f5c7449df49dfa6c3c03bc..c8270f844418dc46adb795ad93869c05db636ed7 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1749,7 +1749,8 @@ 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].srgb_moment[i]=
+        (-MagickLog10(moments[channel].I[i]));
   moments=(ChannelMoments *) RelinquishMagickMemory(moments);
   /*
     Blur then transform to HCLp colorspace.
@@ -1779,7 +1780,8 @@ 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].hclp_moment[i]=
+        (-MagickLog10(moments[channel].I[i]));
   moments=(ChannelMoments *) RelinquishMagickMemory(moments);
   return(perceptual_hash);
 }

diff --git a/MagickCore/statistic.h b/MagickCore/statistic.h
index 5917cdc476fa446ca3be816b53a00951f51db00a..0d7c6252b75a81b10cda35a4638fe8b1c82e2e7c 100644 (file)
--- a/MagickCore/statistic.h
+++ b/MagickCore/statistic.h
@@ -60,8 +60,8 @@ typedef struct _ChannelMoments
 typedef struct _ChannelPerceptualHash
 {
   double
-    P[32],
-    Q[32];
+    srgb_moment[32],
+    hclp_moment[32];
 } ChannelPerceptualHash;
 
 typedef enum

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b834ac40116d74d9b984b76599865b19a99cbbc9..b5f84899e840b61606a37d31611bab5999793040 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-08-26"
+#define MagickReleaseDate  "2014-09-05"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/coders/json.c b/coders/json.c
index c1dce23d000400e51075b55ba62787661abda8af..412f1a360e75d175f452248d33c47772a0f1dba0 100644 (file)
--- a/coders/json.c
+++ b/coders/json.c
@@ -432,12 +432,12 @@ static ssize_t PrintChannelPerceptualHash(FILE *file,const ChannelType channel,
   for (i=0; i < 6; i++)
     n+=FormatLocaleFile(file,
       "        \"PH%.20g\": [ \"%.*g\", \"%.*g\" ],\n",i+1.0,
-      GetMagickPrecision(),channel_phash[channel].P[i],
-      GetMagickPrecision(),channel_phash[channel].Q[i]);
+      GetMagickPrecision(),channel_phash[channel].srgb_moment[i],
+      GetMagickPrecision(),channel_phash[channel].hclp_moment[i]);
   n+=FormatLocaleFile(file,
     "        \"PH%.20g\": [ \"%.*g\", \"%.*g\" ]\n",i+1.0,
-    GetMagickPrecision(),channel_phash[channel].P[i],
-    GetMagickPrecision(),channel_phash[channel].Q[i]);
+    GetMagickPrecision(),channel_phash[channel].srgb_moment[i],
+    GetMagickPrecision(),channel_phash[channel].hclp_moment[i]);
   (void) FormatLocaleFile(file,"      }");
   if (separator != MagickFalse)
     (void) FormatLocaleFile(file,",");