From d8b716c0720be68bd94625c5df8b37e2ba801e33 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 28 Sep 2018 10:24:48 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1331 --- Magick++/lib/Statistic.cpp | 16 ++++++++-------- MagickCore/MagickCore.h | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Magick++/lib/Statistic.cpp b/Magick++/lib/Statistic.cpp index c41091516..250aca3fd 100644 --- a/Magick++/lib/Statistic.cpp +++ b/Magick++/lib/Statistic.cpp @@ -110,7 +110,7 @@ Magick::ChannelMoments::ChannelMoments(const PixelChannel channel_, _ellipseEccentricity(channelMoments_->ellipse_eccentricity), _ellipseIntensity(channelMoments_->ellipse_intensity) { - register ssize_t + ssize_t i; for (i=0; i<8; i++) @@ -138,7 +138,7 @@ Magick::ChannelPerceptualHash::ChannelPerceptualHash( _srgbHuPhash(7), _hclpHuPhash(7) { - register ssize_t + ssize_t i; if (hash_.length() != 70) @@ -174,7 +174,7 @@ Magick::ChannelPerceptualHash::operator std::string() const std::string hash; - register ssize_t + ssize_t i; if (!isValid()) @@ -229,7 +229,7 @@ double Magick::ChannelPerceptualHash::sumSquaredDifferences( double ssd; - register ssize_t + ssize_t i; ssd=0.0; @@ -266,7 +266,7 @@ Magick::ChannelPerceptualHash::ChannelPerceptualHash( _srgbHuPhash(7), _hclpHuPhash(7) { - register ssize_t + ssize_t i; for (i=0; i<7; i++) @@ -455,7 +455,7 @@ Magick::ImageMoments::ImageMoments(const Image &image_) channel_moments=GetImageMoments(image_.constImage(),exceptionInfo); if (channel_moments != (MagickCore::ChannelMoments *) NULL) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image_.constImage()); i++) @@ -551,7 +551,7 @@ double Magick::ImagePerceptualHash::sumSquaredDifferences( double ssd; - register ssize_t + ssize_t i; if (!isValid()) @@ -637,7 +637,7 @@ Magick::ImageStatistics::ImageStatistics(const Image &image_) channel_statistics=GetImageStatistics(image_.constImage(),exceptionInfo); if (channel_statistics != (MagickCore::ChannelStatistics *) NULL) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image_.constImage()); i++) diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h index aa24c6132..e108f2c8b 100644 --- a/MagickCore/MagickCore.h +++ b/MagickCore/MagickCore.h @@ -47,9 +47,6 @@ extern "C" { # undef inline # endif #endif -#if __cplusplus > 199711L -#define register -#endif #define MAGICKCORE_CHECK_VERSION(major,minor,micro) \ ((MAGICKCORE_MAJOR_VERSION > (major)) || \ -- 2.40.0