(no commit message)

diff --git a/Magick++/lib/Magick++/Statistic.h b/Magick++/lib/Magick++/Statistic.h
index 5a18121f1a3b564e86584ba35c8b7f0d9c626517..be3eacf1fe8ecf595b20d577662ebf7fa3de9ee5 100644 (file)
--- a/Magick++/lib/Magick++/Statistic.h
+++ b/Magick++/lib/Magick++/Statistic.h
@@ -298,4 +298,4 @@ namespace Magick
   };
 }
 
-#endif // Magick_ChannelMoments_header
\ No newline at end of file
+#endif // Magick_ChannelMoments_header

diff --git a/Magick++/lib/Statistic.cpp b/Magick++/lib/Statistic.cpp
index f19f6c851ba753dc87e123e592e15bb065ea9182..97f6c3ea4810b3adc99491bb23ec5e167008b7c3 100644 (file)
--- a/Magick++/lib/Statistic.cpp
+++ b/Magick++/lib/Statistic.cpp
@@ -113,7 +113,7 @@ Magick::ChannelMoments::ChannelMoments(const PixelChannel channel_,
     i;
 
   for (i=0; i<8; i++)
-    _huInvariants.push_back(channelMoments_->I[i]);
+    _huInvariants.push_back(channelMoments_->invariant[i]);
 }
 
 Magick::ChannelPerceptualHash::ChannelPerceptualHash(void)
@@ -647,4 +647,4 @@ Magick::ImageStatistics::ImageStatistics(const MagickCore::Image *image)
         channel_statistics);
     }
   ThrowPPException;
-}
\ No newline at end of file
+}

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 34a8b8c37ca1cf37304afe9d9b03e6208678c607..96a5c953d86116e1668e7a3d8cf02ca67fceb838 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -378,8 +378,8 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel,
     channel_moments[channel].ellipse_intensity);
   for (i=0; i < MaximumNumberOfImageMoments; i++)
     n+=FormatLocaleFile(file,"      I%.20g: %.*g (%.*g)\n",i+1.0,
-      GetMagickPrecision(),channel_moments[channel].I[i]/pow(scale,powers[i]),
-      GetMagickPrecision(),channel_moments[channel].I[i]);
+      GetMagickPrecision(),channel_moments[channel].invariant[i]/pow(scale,
+      powers[i]),GetMagickPrecision(),channel_moments[channel].invariant[i]);
   return(n);
 }
 

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 776624cb3eaf88517d4a50d4e2e1dcd222d54989..003fef021feebc44e0d9c8161afaac1263bd9b31 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1635,35 +1635,35 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
     /*
       Compute Hu invariant moments.
     */
-    channel_moments[channel].I[0]=M20[channel]+M02[channel];
-    channel_moments[channel].I[1]=(M20[channel]-M02[channel])*
+    channel_moments[channel].invariant[0]=M20[channel]+M02[channel];
+    channel_moments[channel].invariant[1]=(M20[channel]-M02[channel])*
       (M20[channel]-M02[channel])+4.0*M11[channel]*M11[channel];
-    channel_moments[channel].I[2]=(M30[channel]-3.0*M12[channel])*
+    channel_moments[channel].invariant[2]=(M30[channel]-3.0*M12[channel])*
       (M30[channel]-3.0*M12[channel])+(3.0*M21[channel]-M03[channel])*
       (3.0*M21[channel]-M03[channel]);
-    channel_moments[channel].I[3]=(M30[channel]+M12[channel])*
+    channel_moments[channel].invariant[3]=(M30[channel]+M12[channel])*
       (M30[channel]+M12[channel])+(M21[channel]+M03[channel])*
       (M21[channel]+M03[channel]);
-    channel_moments[channel].I[4]=(M30[channel]-3.0*M12[channel])*
+    channel_moments[channel].invariant[4]=(M30[channel]-3.0*M12[channel])*
       (M30[channel]+M12[channel])*((M30[channel]+M12[channel])*
       (M30[channel]+M12[channel])-3.0*(M21[channel]+M03[channel])*
       (M21[channel]+M03[channel]))+(3.0*M21[channel]-M03[channel])*
       (M21[channel]+M03[channel])*(3.0*(M30[channel]+M12[channel])*
       (M30[channel]+M12[channel])-(M21[channel]+M03[channel])*
       (M21[channel]+M03[channel]));
-    channel_moments[channel].I[5]=(M20[channel]-M02[channel])*
+    channel_moments[channel].invariant[5]=(M20[channel]-M02[channel])*
       ((M30[channel]+M12[channel])*(M30[channel]+M12[channel])-
       (M21[channel]+M03[channel])*(M21[channel]+M03[channel]))+
       4.0*M11[channel]*(M30[channel]+M12[channel])*(M21[channel]+M03[channel]);
-    channel_moments[channel].I[6]=(3.0*M21[channel]-M03[channel])*
+    channel_moments[channel].invariant[6]=(3.0*M21[channel]-M03[channel])*
       (M30[channel]+M12[channel])*((M30[channel]+M12[channel])*
       (M30[channel]+M12[channel])-3.0*(M21[channel]+M03[channel])*
       (M21[channel]+M03[channel]))-(M30[channel]-3*M12[channel])*
       (M21[channel]+M03[channel])*(3.0*(M30[channel]+M12[channel])*
       (M30[channel]+M12[channel])-(M21[channel]+M03[channel])*
       (M21[channel]+M03[channel]));
-    channel_moments[channel].I[7]=M11[channel]*((M30[channel]+M12[channel])*
-      (M30[channel]+M12[channel])-(M03[channel]+M21[channel])*
+    channel_moments[channel].invariant[7]=M11[channel]*((M30[channel]+
+      M12[channel])*(M30[channel]+M12[channel])-(M03[channel]+M21[channel])*
       (M03[channel]+M21[channel]))-(M20[channel]-M02[channel])*
       (M30[channel]+M12[channel])*(M03[channel]+M21[channel]);
   }
@@ -1750,7 +1750,7 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash(
   for (channel=0; channel <= MaxPixelChannels; channel++)
     for (i=0; i < MaximumNumberOfImageMoments; i++)
       perceptual_hash[channel].srgb_hu_phash[i]=
-        (-MagickLog10(moments[channel].I[i]));
+        (-MagickLog10(moments[channel].invariant[i]));
   moments=(ChannelMoments *) RelinquishMagickMemory(moments);
   /*
     Blur then transform to HCLp colorspace.
@@ -1781,7 +1781,7 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash(
   for (channel=0; channel <= MaxPixelChannels; channel++)
     for (i=0; i < MaximumNumberOfImageMoments; i++)
       perceptual_hash[channel].hclp_hu_phash[i]=
-        (-MagickLog10(moments[channel].I[i]));
+        (-MagickLog10(moments[channel].invariant[i]));
   moments=(ChannelMoments *) RelinquishMagickMemory(moments);
   return(perceptual_hash);
 }

diff --git a/MagickCore/statistic.h b/MagickCore/statistic.h
index 6017bf77ac0362b6dab994ddb47640e1ae0f11df..2c23604393ce26bf245a9391c55dbac8714edfa0 100644 (file)
--- a/MagickCore/statistic.h
+++ b/MagickCore/statistic.h
@@ -47,7 +47,7 @@ typedef struct _ChannelStatistics
 typedef struct _ChannelMoments
 {
   double
-    I[MaximumNumberOfImageMoments+1];
+     invariant[MaximumNumberOfImageMoments+1];
 
   PointInfo
     centroid,

diff --git a/coders/json.c b/coders/json.c
index 541c0c758bc87cba1b3acaea6766a3bad457a996..7984205c6db76339f2285ec6907428fd982707af 100644 (file)
--- a/coders/json.c
+++ b/coders/json.c
@@ -414,7 +414,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel,
     GetMagickPrecision(),channel_moments[channel].ellipse_intensity);
   for (i=0; i < 8; i++)
     n+=FormatLocaleFile(file,"      I%.20g: %.*g\n",i+1.0,GetMagickPrecision(),
-      channel_moments[channel].I[i]);
+      channel_moments[channel].invariant[i]);
   return(n);
 }