Set perceptual hash size to max pixel channels

diff --git a/MagickCore/accelerate-kernels-private.h b/MagickCore/accelerate-kernels-private.h
index 1bc25118b07a32cd7ffaa179e968f368de0ae71a..d6a0781d2d2c2f1b7cac3b8d27eac19a2a583bad 100644 (file)
--- a/MagickCore/accelerate-kernels-private.h
+++ b/MagickCore/accelerate-kernels-private.h
@@ -266,7 +266,7 @@ const char *accelerateKernels =
        ReadMaskChannel = 0x0040,          /* Pixel is Not Readable? */
        WriteMaskChannel = 0x0080,         /* Pixel is Write Protected? */
        MetaChannel = 0x0100,              /* ???? */
-       CompositeChannels = 0x002F,
+       CompositeChannels = 0x001F,
        AllChannels = 0x7ffffff,
        /*
          Special purpose channel types.

diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index ad371a40aba0f9c295bdbe6bb9d860dd7f096b84..5c41debb6d6bacac38a2ccf6a0419046d4a5f842 100644 (file)
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -674,7 +674,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if ((image->columns < (distance+1)) || (image->rows < (distance+1)))
     return((ChannelFeatures *) NULL);
-  length=CompositeChannels+1UL;
+  length=MaxPixelChannels+1UL;
   channel_features=(ChannelFeatures *) AcquireQuantumMemory(length,
     sizeof(*channel_features));
   if (channel_features == (ChannelFeatures *) NULL)

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 4fb916aad19cfdf117ad4944daa72c9ecd4118fc..c40559fde8d4a2418d7973a8a6d7128fa9106bd3 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1813,7 +1813,7 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash(
   if (moments == (ChannelMoments *) NULL)
     return((ChannelPerceptualHash *) NULL);
   perceptual_hash=(ChannelPerceptualHash *) AcquireQuantumMemory(
-    CompositeChannels+1UL,sizeof(*perceptual_hash));
+    MaxPixelChannels+1UL,sizeof(*perceptual_hash));
   if (perceptual_hash == (ChannelPerceptualHash *) NULL)
     return((ChannelPerceptualHash *) NULL);
   for (channel=0; channel <= MaxPixelChannels; channel++)