From: Dirk Lemstra Date: Sat, 27 Jan 2018 20:00:22 +0000 (+0100) Subject: Added new listLength policy to the ResourceLimits. X-Git-Tag: 7.0.7-23~256 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6065a31a3f8e6b7707ebdf51421d3879dce483fb;p=imagemagick Added new listLength policy to the ResourceLimits. --- diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index fd05c1bbf..b828f5b4b 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -1052,6 +1052,7 @@ namespace Magick using MagickCore::ThrottleResource; using MagickCore::TimeResource; using MagickCore::WidthResource; + using MagickCore::ListLengthResource; // Resolution units using MagickCore::ResolutionType; diff --git a/Magick++/lib/Magick++/ResourceLimits.h b/Magick++/lib/Magick++/ResourceLimits.h index 2e0db8803..77fd8427d 100644 --- a/Magick++/lib/Magick++/ResourceLimits.h +++ b/Magick++/lib/Magick++/ResourceLimits.h @@ -38,6 +38,10 @@ namespace Magick static void height(const MagickSizeType limit_); static MagickSizeType height(void); + // The maximum number of images in an image list. + static void listLength(const MagickSizeType limit_); + static MagickSizeType listLength(); + // Pixel cache limit in bytes. Once this memory limit is exceeded, // all subsequent pixels cache operations are to/from disk. static void map(const MagickSizeType limit_); diff --git a/Magick++/lib/ResourceLimits.cpp b/Magick++/lib/ResourceLimits.cpp index 20a0598d1..f45d9cf63 100644 --- a/Magick++/lib/ResourceLimits.cpp +++ b/Magick++/lib/ResourceLimits.cpp @@ -50,6 +50,16 @@ MagickCore::MagickSizeType Magick::ResourceLimits::height(void) return(GetMagickResourceLimit(HeightResource)); } +void Magick::ResourceLimits::listLength(const MagickSizeType limit_) +{ + (void) SetMagickResourceLimit(ListLengthResource,limit_); +} + +MagickCore::MagickSizeType Magick::ResourceLimits::listLength(void) +{ + return(GetMagickResourceLimit(ListLengthResource)); +} + void Magick::ResourceLimits::map(const MagickSizeType limit_) { (void) SetMagickResourceLimit(MapResource,limit_);