(no commit message)

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 1e83a82a1676f8ff6b4af99fe5ea98963f132112..85523ee5e884e57c3f0c54cc6a7ad73f3bc9b6c2 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -407,7 +407,7 @@ static ssize_t PrintChannelStatistics(FILE *file,const PixelChannel channel,
 #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"
+  "      kurtosis: %g\n      skewness: %g\n      entropy: %g\n"
 
   ssize_t
     n;
@@ -420,7 +420,8 @@ static ssize_t PrintChannelStatistics(FILE *file,const PixelChannel channel,
     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);
+    channel_statistics[channel].kurtosis,channel_statistics[channel].skewness,
+    channel_statistics[channel].entropy);
   return(n);
 }
 

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 003fef021feebc44e0d9c8161afaac1263bd9b31..85bbfab52aca78513f28b02081dffd616fe241ba 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1397,7 +1397,7 @@ static size_t GetImageChannels(const Image *image)
     if ((traits & UpdatePixelTrait) != 0)
       channels++;
   }
-  return(channels == 0 ? 1 : channels);
+  return((size_t) (channels == 0 ? 1 : channels));
 }
 
 MagickExport ChannelMoments *GetImageMoments(const Image *image,
@@ -1504,8 +1504,8 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
     if (M00[channel] < MagickEpsilon)
       {
         M00[channel]+=MagickEpsilon;
-        centroid[channel].x=image->columns/2.0;
-        centroid[channel].y=image->rows/2.0;
+        centroid[channel].x=(double) image->columns/2.0;
+        centroid[channel].y=(double) image->rows/2.0;
         continue;
       }
     M00[channel]+=MagickEpsilon;
@@ -1940,6 +1940,9 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
   ChannelStatistics
     *channel_statistics;
 
+  double
+    *histogram;
+
   MagickStatusType
     status;
 
@@ -1960,10 +1963,20 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,GetPixelChannels(image)*
+    sizeof(*histogram));
   channel_statistics=(ChannelStatistics *) AcquireQuantumMemory(
     MaxPixelChannels+1,sizeof(*channel_statistics));
-  if (channel_statistics == (ChannelStatistics *) NULL)
-    return(channel_statistics);
+  if ((channel_statistics == (ChannelStatistics *) NULL) ||
+      (histogram == (double *) NULL))
+    {
+      if (histogram != (double *) NULL)
+        histogram=(double *) RelinquishMagickMemory(histogram);
+      if (channel_statistics != (ChannelStatistics *) NULL)
+        channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
+          channel_statistics);
+      return(channel_statistics);
+    }
   (void) ResetMagickMemory(channel_statistics,0,(MaxPixelChannels+1)*
     sizeof(*channel_statistics));
   for (i=0; i <= (ssize_t) MaxPixelChannels; i++)
@@ -1972,6 +1985,8 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
     channel_statistics[i].maxima=(-MagickMaximumValue);
     channel_statistics[i].minima=MagickMaximumValue;
   }
+  (void) ResetMagickMemory(histogram,0,(MaxMap+1)*GetPixelChannels(image)*
+    sizeof(*histogram));
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     register const Quantum
@@ -2022,6 +2037,8 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
         channel_statistics[channel].sum_fourth_power+=(double) p[i]*p[i]*p[i]*
           p[i];
         channel_statistics[channel].area++;
+        histogram[GetPixelChannels(image)*ScaleQuantumToMap(
+          ClampToQuantum((double) p[i]))+i]++;
       }
       p+=GetPixelChannels(image);
     }
@@ -2031,6 +2048,9 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
     double
       area;
 
+    register ssize_t
+      j;
+
     area=PerceptibleReciprocal(channel_statistics[i].area);
     channel_statistics[i].sum*=area;
     channel_statistics[i].sum_squared*=area;
@@ -2041,6 +2061,15 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
     channel_statistics[i].standard_deviation=sqrt(
       channel_statistics[i].variance-(channel_statistics[i].mean*
       channel_statistics[i].mean));
+    for (j=0; j < (ssize_t) (MaxMap+1U); j++)
+    {
+      double
+        count;
+
+      count=histogram[GetPixelChannels(image)*j+i]/area;
+      channel_statistics[i].entropy+=-count*MagickLog10(count)/
+        MagickLog10(MaxMap+1.0);
+    }
   }
   for (i=0; i < (ssize_t) MaxPixelChannels; i++)
   {
@@ -2065,6 +2094,8 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
     channel_statistics[CompositePixelChannel].standard_deviation+=
       channel_statistics[i].variance-channel_statistics[i].mean*
       channel_statistics[i].mean;
+    channel_statistics[CompositePixelChannel].entropy+=
+      channel_statistics[i].entropy;
   }
   channels=GetImageChannels(image);
   channel_statistics[CompositePixelChannel].area/=channels;
@@ -2078,6 +2109,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
     sqrt(channel_statistics[CompositePixelChannel].standard_deviation/channels);
   channel_statistics[CompositePixelChannel].kurtosis/=channels;
   channel_statistics[CompositePixelChannel].skewness/=channels;
+  channel_statistics[CompositePixelChannel].entropy/=channels;
   for (i=0; i <= (ssize_t) MaxPixelChannels; i++)
   {
     double
@@ -2100,6 +2132,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
       channel_statistics[i].mean)*(standard_deviation*standard_deviation*
       standard_deviation*standard_deviation)-3.0;
   }
+  histogram=(double *) RelinquishMagickMemory(histogram);
   if (y < (ssize_t) image->rows)
     channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
       channel_statistics);

diff --git a/MagickCore/statistic.h b/MagickCore/statistic.h
index a410db372628dd6de0888e2e6f2b73f315897565..e3a93a4958ae8e63d282899ae9ef76ec0675c55a 100644 (file)
--- a/MagickCore/statistic.h
+++ b/MagickCore/statistic.h
@@ -42,7 +42,8 @@ typedef struct _ChannelStatistics
     variance,
     standard_deviation,
     kurtosis,
-    skewness;
+    skewness,
+    entropy;
 } ChannelStatistics;
 
 typedef struct _ChannelMoments