From 50debe5028731f7b7218c99c9c70e87ae5d43832 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 10 Jul 2016 09:42:38 -0400 Subject: [PATCH] Set perceptual hash size to max pixel channels --- MagickCore/accelerate-kernels-private.h | 2 +- MagickCore/feature.c | 2 +- MagickCore/statistic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MagickCore/accelerate-kernels-private.h b/MagickCore/accelerate-kernels-private.h index 1bc25118b..d6a0781d2 100644 --- 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 ad371a40a..5c41debb6 100644 --- 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 4fb916aad..c40559fde 100644 --- 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++) -- 2.40.0