commit 101ab708b0574518ac5715da4d3915400e9df79a
author cristy <urban-warrior@git.imagemagick.org> Thu Oct 13 13:06:32 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Oct 13 13:06:32 2011 +0000
tree ae82d6bf1eb743f757f6dd59d61f2eab13b26065
parent 1224a9941fcdddc1c36cbc74e34c81b7fb67ce28

MagickCore/feature.c

diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 3ccfa55..f0b1257 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -140,7 +140,7 @@
 {
   typedef struct _ChannelStatistics
   {
-    PixelDoublePacket
+    PixelInfo
       direction[4];  /* horizontal, vertical, left and right diagonals */
   } ChannelStatistics;
 
@@ -167,7 +167,7 @@
     sum_squares,
     variance;
 
-  PixelLongPacket
+  PixelPacket
     gray,
     *grays;
 
@@ -203,8 +203,8 @@
   /*
     Form grays.
   */
-  grays=(PixelLongPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*grays));
-  if (grays == (PixelLongPacket *) NULL)
+  grays=(PixelPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*grays));
+  if (grays == (PixelPacket *) NULL)
     {
       channel_features=(ChannelFeatures *) RelinquishMagickMemory(
         channel_features);
@@ -261,7 +261,7 @@
   image_view=DestroyCacheView(image_view);
   if (status == MagickFalse)
     {
-      grays=(PixelLongPacket *) RelinquishMagickMemory(grays);
+      grays=(PixelPacket *) RelinquishMagickMemory(grays);
       channel_features=(ChannelFeatures *) RelinquishMagickMemory(
         channel_features);
       return(channel_features);
@@ -335,7 +335,7 @@
           cooccurrence=(ChannelStatistics **) RelinquishMagickMemory(
             cooccurrence);
         }
-      grays=(PixelLongPacket *) RelinquishMagickMemory(grays);
+      grays=(PixelPacket *) RelinquishMagickMemory(grays);
       channel_features=(ChannelFeatures *) RelinquishMagickMemory(
         channel_features);
       (void) ThrowMagickException(exception,GetMagickModule(),
@@ -384,7 +384,7 @@
       density_y=(ChannelStatistics *) RelinquishMagickMemory(density_y);
       density_xy=(ChannelStatistics *) RelinquishMagickMemory(density_xy);
       density_x=(ChannelStatistics *) RelinquishMagickMemory(density_x);
-      grays=(PixelLongPacket *) RelinquishMagickMemory(grays);
+      grays=(PixelPacket *) RelinquishMagickMemory(grays);
       channel_features=(ChannelFeatures *) RelinquishMagickMemory(
         channel_features);
       (void) ThrowMagickException(exception,GetMagickModule(),
@@ -510,7 +510,7 @@
       p+=GetPixelChannels(image);
     }
   }
-  grays=(PixelLongPacket *) RelinquishMagickMemory(grays);
+  grays=(PixelPacket *) RelinquishMagickMemory(grays);
   image_view=DestroyCacheView(image_view);
   if (status == MagickFalse)
     {