Update ImageMagick from 7.1.1-20 -> 7.1.1-21

MolotovCherry · Oct 22, 2023 · be01aae · be01aae
1 parent e5bb198
commit be01aae
Show file tree

Hide file tree

Showing 643 changed files with 288 additions and 264 deletions.
diff --git a/Android.mk b/Android.mk
@@ -30,7 +30,7 @@ OPENCL_INCLUDE_PATH             := $(OPENCL_PATH)/qualcomm/include
 
 LTDL_LIB_PATH                   := $(LOCAL_PATH)/libltdl-2.4.6
 
-IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.1-20
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.1-21
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2

diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Blob.cpp → ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp b/ImageMagick-7.1.1-20/Magick++/lib/Blob.cpp → ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp
diff --git a/...eMagick-7.1.1-20/Magick++/lib/BlobRef.cpp → ...eMagick-7.1.1-21/Magick++/lib/BlobRef.cpp b/...eMagick-7.1.1-20/Magick++/lib/BlobRef.cpp → ...eMagick-7.1.1-21/Magick++/lib/BlobRef.cpp
diff --git a/...agick-7.1.1-20/Magick++/lib/CoderInfo.cpp → ...agick-7.1.1-21/Magick++/lib/CoderInfo.cpp b/...agick-7.1.1-20/Magick++/lib/CoderInfo.cpp → ...agick-7.1.1-21/Magick++/lib/CoderInfo.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Color.cpp → ImageMagick-7.1.1-21/Magick++/lib/Color.cpp b/ImageMagick-7.1.1-20/Magick++/lib/Color.cpp → ImageMagick-7.1.1-21/Magick++/lib/Color.cpp
diff --git a/...Magick-7.1.1-20/Magick++/lib/Drawable.cpp → ...Magick-7.1.1-21/Magick++/lib/Drawable.cpp b/...Magick-7.1.1-20/Magick++/lib/Drawable.cpp → ...Magick-7.1.1-21/Magick++/lib/Drawable.cpp
diff --git a/...agick-7.1.1-20/Magick++/lib/Exception.cpp → ...agick-7.1.1-21/Magick++/lib/Exception.cpp b/...agick-7.1.1-20/Magick++/lib/Exception.cpp → ...agick-7.1.1-21/Magick++/lib/Exception.cpp
diff --git a/...agick-7.1.1-20/Magick++/lib/Functions.cpp → ...agick-7.1.1-21/Magick++/lib/Functions.cpp b/...agick-7.1.1-20/Magick++/lib/Functions.cpp → ...agick-7.1.1-21/Magick++/lib/Functions.cpp
diff --git a/...Magick-7.1.1-20/Magick++/lib/Geometry.cpp → ...Magick-7.1.1-21/Magick++/lib/Geometry.cpp b/...Magick-7.1.1-20/Magick++/lib/Geometry.cpp → ...Magick-7.1.1-21/Magick++/lib/Geometry.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Image.cpp → ImageMagick-7.1.1-21/Magick++/lib/Image.cpp b/ImageMagick-7.1.1-20/Magick++/lib/Image.cpp → ImageMagick-7.1.1-21/Magick++/lib/Image.cpp
diff --git a/...Magick-7.1.1-20/Magick++/lib/ImageRef.cpp → ...Magick-7.1.1-21/Magick++/lib/ImageRef.cpp b/...Magick-7.1.1-20/Magick++/lib/ImageRef.cpp → ...Magick-7.1.1-21/Magick++/lib/ImageRef.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Magick++.h → ImageMagick-7.1.1-21/Magick++/lib/Magick++.h b/ImageMagick-7.1.1-20/Magick++/lib/Magick++.h → ImageMagick-7.1.1-21/Magick++/lib/Magick++.h
diff --git a/...ick-7.1.1-20/Magick++/lib/Magick++/Blob.h → ...ick-7.1.1-21/Magick++/lib/Magick++/Blob.h b/...ick-7.1.1-20/Magick++/lib/Magick++/Blob.h → ...ick-7.1.1-21/Magick++/lib/Magick++/Blob.h
diff --git a/...-7.1.1-20/Magick++/lib/Magick++/BlobRef.h → ...-7.1.1-21/Magick++/lib/Magick++/BlobRef.h b/...-7.1.1-20/Magick++/lib/Magick++/BlobRef.h → ...-7.1.1-21/Magick++/lib/Magick++/BlobRef.h
diff --git a/....1.1-20/Magick++/lib/Magick++/CoderInfo.h → ....1.1-21/Magick++/lib/Magick++/CoderInfo.h b/....1.1-20/Magick++/lib/Magick++/CoderInfo.h → ....1.1-21/Magick++/lib/Magick++/CoderInfo.h
diff --git a/...ck-7.1.1-20/Magick++/lib/Magick++/Color.h → ...ck-7.1.1-21/Magick++/lib/Magick++/Color.h b/...ck-7.1.1-20/Magick++/lib/Magick++/Color.h → ...ck-7.1.1-21/Magick++/lib/Magick++/Color.h
diff --git a/...7.1.1-20/Magick++/lib/Magick++/Drawable.h → ...7.1.1-21/Magick++/lib/Magick++/Drawable.h b/...7.1.1-20/Magick++/lib/Magick++/Drawable.h → ...7.1.1-21/Magick++/lib/Magick++/Drawable.h
diff --git a/....1.1-20/Magick++/lib/Magick++/Exception.h → ....1.1-21/Magick++/lib/Magick++/Exception.h b/....1.1-20/Magick++/lib/Magick++/Exception.h → ....1.1-21/Magick++/lib/Magick++/Exception.h
diff --git a/....1.1-20/Magick++/lib/Magick++/Functions.h → ....1.1-21/Magick++/lib/Magick++/Functions.h b/....1.1-20/Magick++/lib/Magick++/Functions.h → ....1.1-21/Magick++/lib/Magick++/Functions.h
diff --git a/...7.1.1-20/Magick++/lib/Magick++/Geometry.h → ...7.1.1-21/Magick++/lib/Magick++/Geometry.h b/...7.1.1-20/Magick++/lib/Magick++/Geometry.h → ...7.1.1-21/Magick++/lib/Magick++/Geometry.h
diff --git a/...ck-7.1.1-20/Magick++/lib/Magick++/Image.h → ...ck-7.1.1-21/Magick++/lib/Magick++/Image.h b/...ck-7.1.1-20/Magick++/lib/Magick++/Image.h → ...ck-7.1.1-21/Magick++/lib/Magick++/Image.h
diff --git a/...7.1.1-20/Magick++/lib/Magick++/ImageRef.h → ...7.1.1-21/Magick++/lib/Magick++/ImageRef.h b/...7.1.1-20/Magick++/lib/Magick++/ImageRef.h → ...7.1.1-21/Magick++/lib/Magick++/ImageRef.h
diff --git a/...-7.1.1-20/Magick++/lib/Magick++/Include.h → ...-7.1.1-21/Magick++/lib/Magick++/Include.h b/...-7.1.1-20/Magick++/lib/Magick++/Include.h → ...-7.1.1-21/Magick++/lib/Magick++/Include.h
diff --git a/...-7.1.1-20/Magick++/lib/Magick++/Montage.h → ...-7.1.1-21/Magick++/lib/Magick++/Montage.h b/...-7.1.1-20/Magick++/lib/Magick++/Montage.h → ...-7.1.1-21/Magick++/lib/Magick++/Montage.h
diff --git a/...-7.1.1-20/Magick++/lib/Magick++/Options.h → ...-7.1.1-21/Magick++/lib/Magick++/Options.h b/...-7.1.1-20/Magick++/lib/Magick++/Options.h → ...-7.1.1-21/Magick++/lib/Magick++/Options.h
diff --git a/...k-7.1.1-20/Magick++/lib/Magick++/Pixels.h → ...k-7.1.1-21/Magick++/lib/Magick++/Pixels.h b/...k-7.1.1-20/Magick++/lib/Magick++/Pixels.h → ...k-7.1.1-21/Magick++/lib/Magick++/Pixels.h
diff --git a/...20/Magick++/lib/Magick++/ResourceLimits.h → ...21/Magick++/lib/Magick++/ResourceLimits.h b/...20/Magick++/lib/Magick++/ResourceLimits.h → ...21/Magick++/lib/Magick++/ResourceLimits.h
diff --git a/...gick-7.1.1-20/Magick++/lib/Magick++/STL.h → ...gick-7.1.1-21/Magick++/lib/Magick++/STL.h b/...gick-7.1.1-20/Magick++/lib/Magick++/STL.h → ...gick-7.1.1-21/Magick++/lib/Magick++/STL.h
diff --git a/...20/Magick++/lib/Magick++/SecurityPolicy.h → ...21/Magick++/lib/Magick++/SecurityPolicy.h b/...20/Magick++/lib/Magick++/SecurityPolicy.h → ...21/Magick++/lib/Magick++/SecurityPolicy.h
diff --git a/....1.1-20/Magick++/lib/Magick++/Statistic.h → ....1.1-21/Magick++/lib/Magick++/Statistic.h b/....1.1-20/Magick++/lib/Magick++/Statistic.h → ....1.1-21/Magick++/lib/Magick++/Statistic.h
diff --git a/...k-7.1.1-20/Magick++/lib/Magick++/Thread.h → ...k-7.1.1-21/Magick++/lib/Magick++/Thread.h b/...k-7.1.1-20/Magick++/lib/Magick++/Thread.h → ...k-7.1.1-21/Magick++/lib/Magick++/Thread.h
diff --git a/...1.1-20/Magick++/lib/Magick++/TypeMetric.h → ...1.1-21/Magick++/lib/Magick++/TypeMetric.h b/...1.1-20/Magick++/lib/Magick++/TypeMetric.h → ...1.1-21/Magick++/lib/Magick++/TypeMetric.h
diff --git a/...eMagick-7.1.1-20/Magick++/lib/Montage.cpp → ...eMagick-7.1.1-21/Magick++/lib/Montage.cpp b/...eMagick-7.1.1-20/Magick++/lib/Montage.cpp → ...eMagick-7.1.1-21/Magick++/lib/Montage.cpp
diff --git a/...eMagick-7.1.1-20/Magick++/lib/Options.cpp → ...eMagick-7.1.1-21/Magick++/lib/Options.cpp b/...eMagick-7.1.1-20/Magick++/lib/Options.cpp → ...eMagick-7.1.1-21/Magick++/lib/Options.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Pixels.cpp → ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.1-20/Magick++/lib/Pixels.cpp → ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp
diff --git a/...-7.1.1-20/Magick++/lib/ResourceLimits.cpp → ...-7.1.1-21/Magick++/lib/ResourceLimits.cpp b/...-7.1.1-20/Magick++/lib/ResourceLimits.cpp → ...-7.1.1-21/Magick++/lib/ResourceLimits.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/STL.cpp → ImageMagick-7.1.1-21/Magick++/lib/STL.cpp b/ImageMagick-7.1.1-20/Magick++/lib/STL.cpp → ImageMagick-7.1.1-21/Magick++/lib/STL.cpp
diff --git a/...-7.1.1-20/Magick++/lib/SecurityPolicy.cpp → ...-7.1.1-21/Magick++/lib/SecurityPolicy.cpp b/...-7.1.1-20/Magick++/lib/SecurityPolicy.cpp → ...-7.1.1-21/Magick++/lib/SecurityPolicy.cpp
diff --git a/...agick-7.1.1-20/Magick++/lib/Statistic.cpp → ...agick-7.1.1-21/Magick++/lib/Statistic.cpp b/...agick-7.1.1-20/Magick++/lib/Statistic.cpp → ...agick-7.1.1-21/Magick++/lib/Statistic.cpp
diff --git a/ImageMagick-7.1.1-20/Magick++/lib/Thread.cpp → ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp b/ImageMagick-7.1.1-20/Magick++/lib/Thread.cpp → ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp
diff --git a/...gick-7.1.1-20/Magick++/lib/TypeMetric.cpp → ...gick-7.1.1-21/Magick++/lib/TypeMetric.cpp b/...gick-7.1.1-20/Magick++/lib/TypeMetric.cpp → ...gick-7.1.1-21/Magick++/lib/TypeMetric.cpp
diff --git a/ImageMagick-7.1.1-20/MagickCore/MagickCore.h → ImageMagick-7.1.1-21/MagickCore/MagickCore.h b/ImageMagick-7.1.1-20/MagickCore/MagickCore.h → ImageMagick-7.1.1-21/MagickCore/MagickCore.h
diff --git a/...0/MagickCore/accelerate-kernels-private.h → ...1/MagickCore/accelerate-kernels-private.h b/...0/MagickCore/accelerate-kernels-private.h → ...1/MagickCore/accelerate-kernels-private.h
diff --git a/...-7.1.1-20/MagickCore/accelerate-private.h → ...-7.1.1-21/MagickCore/accelerate-private.h b/...-7.1.1-20/MagickCore/accelerate-private.h → ...-7.1.1-21/MagickCore/accelerate-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/accelerate.c → ImageMagick-7.1.1-21/MagickCore/accelerate.c b/ImageMagick-7.1.1-20/MagickCore/accelerate.c → ImageMagick-7.1.1-21/MagickCore/accelerate.c
diff --git a/...ick-7.1.1-20/MagickCore/animate-private.h → ...ick-7.1.1-21/MagickCore/animate-private.h b/...ick-7.1.1-20/MagickCore/animate-private.h → ...ick-7.1.1-21/MagickCore/animate-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/animate.c → ImageMagick-7.1.1-21/MagickCore/animate.c b/ImageMagick-7.1.1-20/MagickCore/animate.c → ImageMagick-7.1.1-21/MagickCore/animate.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/animate.h → ImageMagick-7.1.1-21/MagickCore/animate.h b/ImageMagick-7.1.1-20/MagickCore/animate.h → ImageMagick-7.1.1-21/MagickCore/animate.h
diff --git a/...ck-7.1.1-20/MagickCore/annotate-private.h → ...ck-7.1.1-21/MagickCore/annotate-private.h b/...ck-7.1.1-20/MagickCore/annotate-private.h → ...ck-7.1.1-21/MagickCore/annotate-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/annotate.c → ImageMagick-7.1.1-21/MagickCore/annotate.c b/ImageMagick-7.1.1-20/MagickCore/annotate.c → ImageMagick-7.1.1-21/MagickCore/annotate.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/annotate.h → ImageMagick-7.1.1-21/MagickCore/annotate.h b/ImageMagick-7.1.1-20/MagickCore/annotate.h → ImageMagick-7.1.1-21/MagickCore/annotate.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/artifact.c → ImageMagick-7.1.1-21/MagickCore/artifact.c b/ImageMagick-7.1.1-20/MagickCore/artifact.c → ImageMagick-7.1.1-21/MagickCore/artifact.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/artifact.h → ImageMagick-7.1.1-21/MagickCore/artifact.h b/ImageMagick-7.1.1-20/MagickCore/artifact.h → ImageMagick-7.1.1-21/MagickCore/artifact.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/attribute.c → ImageMagick-7.1.1-21/MagickCore/attribute.c b/ImageMagick-7.1.1-20/MagickCore/attribute.c → ImageMagick-7.1.1-21/MagickCore/attribute.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/attribute.h → ImageMagick-7.1.1-21/MagickCore/attribute.h b/ImageMagick-7.1.1-20/MagickCore/attribute.h → ImageMagick-7.1.1-21/MagickCore/attribute.h
diff --git a/...Magick-7.1.1-20/MagickCore/blob-private.h → ...Magick-7.1.1-21/MagickCore/blob-private.h b/...Magick-7.1.1-20/MagickCore/blob-private.h → ...Magick-7.1.1-21/MagickCore/blob-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/blob.c → ImageMagick-7.1.1-21/MagickCore/blob.c b/ImageMagick-7.1.1-20/MagickCore/blob.c → ImageMagick-7.1.1-21/MagickCore/blob.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/blob.h → ImageMagick-7.1.1-21/MagickCore/blob.h b/ImageMagick-7.1.1-20/MagickCore/blob.h → ImageMagick-7.1.1-21/MagickCore/blob.h
diff --git a/...agick-7.1.1-20/MagickCore/cache-private.h → ...agick-7.1.1-21/MagickCore/cache-private.h b/...agick-7.1.1-20/MagickCore/cache-private.h → ...agick-7.1.1-21/MagickCore/cache-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/cache-view.c → ImageMagick-7.1.1-21/MagickCore/cache-view.c b/ImageMagick-7.1.1-20/MagickCore/cache-view.c → ImageMagick-7.1.1-21/MagickCore/cache-view.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/cache-view.h → ImageMagick-7.1.1-21/MagickCore/cache-view.h b/ImageMagick-7.1.1-20/MagickCore/cache-view.h → ImageMagick-7.1.1-21/MagickCore/cache-view.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/cache.c → ImageMagick-7.1.1-21/MagickCore/cache.c b/ImageMagick-7.1.1-20/MagickCore/cache.c → ImageMagick-7.1.1-21/MagickCore/cache.c
@@ -1688,29 +1688,25 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
 
   MagickBooleanType
     destroy,
-    status;
+    status = MagickTrue;
 
   static MagickSizeType
     cpu_throttle = MagickResourceInfinity,
     cycles = 0;
 
-  status=MagickTrue;
-  if (cpu_throttle == MagickResourceInfinity)
-    cpu_throttle=GetMagickResourceLimit(ThrottleResource);
-  if ((cycles++ % 4096) == 0)
+  if (difftime(GetMagickTime(),image->timestamp) > (double) image->ttl)
     {
-      if (GetMagickTTL() <= 0)
-        {
-          cache_info=(CacheInfo *) image->cache;
-          if (cache_info->file != -1)
-            (void) ClosePixelCacheOnDisk(cache_info);
-          (void) ThrowMagickException(exception,GetMagickModule(),
-            ResourceLimitFatalError,"TimeLimitExceeded","`%s'",image->filename);
-          return((Cache) NULL);
-        }
-      if (cpu_throttle != 0)
-        MagickDelay(cpu_throttle);
+      cache_info=(CacheInfo *) image->cache;
+      if (cache_info->file != -1)
+        (void) ClosePixelCacheOnDisk(cache_info);
+      (void) ThrowMagickException(exception,GetMagickModule(),
+        ResourceLimitFatalError,"TimeLimitExceeded","`%s'",image->filename);
+      return((Cache) NULL);
     }
+  if (cpu_throttle == MagickResourceInfinity)
+    cpu_throttle=GetMagickResourceLimit(ThrottleResource);
+  if ((cpu_throttle != 0) && ((cycles++ % 4096) == 0))
+    MagickDelay(cpu_throttle);
   LockSemaphoreInfo(image->semaphore);
   assert(image->cache != (Cache) NULL);
   cache_info=(CacheInfo *) image->cache;

diff --git a/ImageMagick-7.1.1-20/MagickCore/cache.h → ImageMagick-7.1.1-21/MagickCore/cache.h b/ImageMagick-7.1.1-20/MagickCore/cache.h → ImageMagick-7.1.1-21/MagickCore/cache.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/channel.c → ImageMagick-7.1.1-21/MagickCore/channel.c b/ImageMagick-7.1.1-20/MagickCore/channel.c → ImageMagick-7.1.1-21/MagickCore/channel.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/channel.h → ImageMagick-7.1.1-21/MagickCore/channel.h b/ImageMagick-7.1.1-20/MagickCore/channel.h → ImageMagick-7.1.1-21/MagickCore/channel.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/cipher.c → ImageMagick-7.1.1-21/MagickCore/cipher.c b/ImageMagick-7.1.1-20/MagickCore/cipher.c → ImageMagick-7.1.1-21/MagickCore/cipher.c
@@ -16,7 +16,7 @@
 %                               March  2003                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization         %
+%  Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization         %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -59,6 +59,7 @@
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
+#include "MagickCore/timer-private.h"
 
 #if defined(MAGICKCORE_CIPHER_SUPPORT)
 /*
@@ -80,7 +81,9 @@ typedef struct _AESInfo
     *decipher_key;
 
   ssize_t
-    rounds,
+    rounds;
+
+  time_t
     timestamp;
 
   size_t
@@ -203,7 +206,7 @@ static AESInfo *AcquireAESInfo(void)
       (aes_info->encipher_key == (unsigned int *) NULL) ||
       (aes_info->decipher_key == (unsigned int *) NULL))
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  aes_info->timestamp=(ssize_t) time(0);
+  aes_info->timestamp=GetMagickTime();
   aes_info->signature=MagickCoreSignature;
   return(aes_info);
 }

diff --git a/ImageMagick-7.1.1-20/MagickCore/cipher.h → ImageMagick-7.1.1-21/MagickCore/cipher.h b/ImageMagick-7.1.1-20/MagickCore/cipher.h → ImageMagick-7.1.1-21/MagickCore/cipher.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/client.c → ImageMagick-7.1.1-21/MagickCore/client.c b/ImageMagick-7.1.1-20/MagickCore/client.c → ImageMagick-7.1.1-21/MagickCore/client.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/client.h → ImageMagick-7.1.1-21/MagickCore/client.h b/ImageMagick-7.1.1-20/MagickCore/client.h → ImageMagick-7.1.1-21/MagickCore/client.h
diff --git a/...agick-7.1.1-20/MagickCore/coder-private.h → ...agick-7.1.1-21/MagickCore/coder-private.h b/...agick-7.1.1-20/MagickCore/coder-private.h → ...agick-7.1.1-21/MagickCore/coder-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/coder.c → ImageMagick-7.1.1-21/MagickCore/coder.c b/ImageMagick-7.1.1-20/MagickCore/coder.c → ImageMagick-7.1.1-21/MagickCore/coder.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/coder.h → ImageMagick-7.1.1-21/MagickCore/coder.h b/ImageMagick-7.1.1-20/MagickCore/coder.h → ImageMagick-7.1.1-21/MagickCore/coder.h
diff --git a/...agick-7.1.1-20/MagickCore/color-private.h → ...agick-7.1.1-21/MagickCore/color-private.h b/...agick-7.1.1-20/MagickCore/color-private.h → ...agick-7.1.1-21/MagickCore/color-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/color.c → ImageMagick-7.1.1-21/MagickCore/color.c b/ImageMagick-7.1.1-20/MagickCore/color.c → ImageMagick-7.1.1-21/MagickCore/color.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/color.h → ImageMagick-7.1.1-21/MagickCore/color.h b/ImageMagick-7.1.1-20/MagickCore/color.h → ImageMagick-7.1.1-21/MagickCore/color.h
diff --git a/...ck-7.1.1-20/MagickCore/colormap-private.h → ...ck-7.1.1-21/MagickCore/colormap-private.h b/...ck-7.1.1-20/MagickCore/colormap-private.h → ...ck-7.1.1-21/MagickCore/colormap-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/colormap.c → ImageMagick-7.1.1-21/MagickCore/colormap.c b/ImageMagick-7.1.1-20/MagickCore/colormap.c → ImageMagick-7.1.1-21/MagickCore/colormap.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/colormap.h → ImageMagick-7.1.1-21/MagickCore/colormap.h b/ImageMagick-7.1.1-20/MagickCore/colormap.h → ImageMagick-7.1.1-21/MagickCore/colormap.h
diff --git a/...-7.1.1-20/MagickCore/colorspace-private.h → ...-7.1.1-21/MagickCore/colorspace-private.h b/...-7.1.1-20/MagickCore/colorspace-private.h → ...-7.1.1-21/MagickCore/colorspace-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/colorspace.c → ImageMagick-7.1.1-21/MagickCore/colorspace.c b/ImageMagick-7.1.1-20/MagickCore/colorspace.c → ImageMagick-7.1.1-21/MagickCore/colorspace.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/colorspace.h → ImageMagick-7.1.1-21/MagickCore/colorspace.h b/ImageMagick-7.1.1-20/MagickCore/colorspace.h → ImageMagick-7.1.1-21/MagickCore/colorspace.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/compare.c → ImageMagick-7.1.1-21/MagickCore/compare.c b/ImageMagick-7.1.1-20/MagickCore/compare.c → ImageMagick-7.1.1-21/MagickCore/compare.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/compare.h → ImageMagick-7.1.1-21/MagickCore/compare.h b/ImageMagick-7.1.1-20/MagickCore/compare.h → ImageMagick-7.1.1-21/MagickCore/compare.h
diff --git a/...k-7.1.1-20/MagickCore/composite-private.h → ...k-7.1.1-21/MagickCore/composite-private.h b/...k-7.1.1-20/MagickCore/composite-private.h → ...k-7.1.1-21/MagickCore/composite-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/composite.c → ImageMagick-7.1.1-21/MagickCore/composite.c b/ImageMagick-7.1.1-20/MagickCore/composite.c → ImageMagick-7.1.1-21/MagickCore/composite.c
@@ -1017,18 +1017,20 @@ static MagickBooleanType CompositeOverImage(Image *image,
       {
         if (y < y_offset)
           continue;
-        if ((y-y_offset) >= (ssize_t) source_image->rows)
+        if ((y-(double) y_offset) >= (double) source_image->rows)
           continue;
       }
     /*
       If pixels is NULL, y is outside overlay region.
     */
     pixels=(Quantum *) NULL;
     p=(Quantum *) NULL;
-    if ((y >= y_offset) && ((y-y_offset) < (ssize_t) source_image->rows))
+    if ((y >= y_offset) &&
+        ((y-(double) y_offset) < (double) source_image->rows))
       {
-        p=GetCacheViewVirtualPixels(source_view,0,y-y_offset,
-          source_image->columns,1,exception);
+        p=GetCacheViewVirtualPixels(source_view,0,
+          CastDoubleToLong(y-(double) y_offset),source_image->columns,1,
+          exception);
         if (p == (const Quantum *) NULL)
           {
             status=MagickFalse;
@@ -1073,11 +1075,11 @@ static MagickBooleanType CompositeOverImage(Image *image,
               q+=GetPixelChannels(image);
               continue;
             }
-          if ((x-x_offset) >= (ssize_t) source_image->columns)
+          if ((x-(double) x_offset) >= (double) source_image->columns)
             break;
         }
       if ((pixels == (Quantum *) NULL) || (x < x_offset) ||
-          ((x-x_offset) >= (ssize_t) source_image->columns))
+          ((x-(double) x_offset) >= (double) source_image->columns))
         {
           Quantum
             source[MaxPixelChannels];
@@ -1087,8 +1089,9 @@ static MagickBooleanType CompositeOverImage(Image *image,
               Sc: source color.
               Dc: canvas color.
           */
-          (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset,source,
-            exception);
+          (void) GetOneVirtualPixel(source_image,
+            CastDoubleToLong(x-(double) x_offset),
+            CastDoubleToLong(y-(double) y_offset),source,exception);
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             MagickRealType
@@ -2304,18 +2307,20 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       {
         if (y < y_offset)
           continue;
-        if ((y-y_offset) >= (ssize_t) source_image->rows)
+        if ((y-(double) y_offset) >= (double) source_image->rows)
           continue;
       }
     /*
       If pixels is NULL, y is outside overlay region.
     */
     pixels=(Quantum *) NULL;
     p=(Quantum *) NULL;
-    if ((y >= y_offset) && ((y-y_offset) < (ssize_t) source_image->rows))
+    if ((y >= y_offset) &&
+        ((y-(double) y_offset) < (double) source_image->rows))
       {
-        p=GetCacheViewVirtualPixels(source_view,0,y-y_offset,
-          source_image->columns,1,exception);
+        p=GetCacheViewVirtualPixels(source_view,0,
+          CastDoubleToLong(y-(double) y_offset),source_image->columns,1,
+          exception);
         if (p == (const Quantum *) NULL)
           {
             status=MagickFalse;
@@ -2351,24 +2356,24 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         Sca = 0.0,
         Si = 0.0;
 
-      ssize_t
-        i;
-
       size_t
         channels;
 
+      ssize_t
+        i;
+
       if (clip_to_self != MagickFalse)
         {
           if (x < x_offset)
             {
               q+=GetPixelChannels(image);
               continue;
             }
-          if ((x-x_offset) >= (ssize_t) source_image->columns)
+          if ((x-(double) x_offset) >= (double) source_image->columns)
             break;
         }
       if ((pixels == (Quantum *) NULL) || (x < x_offset) ||
-          ((x-x_offset) >= (ssize_t) source_image->columns))
+          ((x-(double) x_offset) >= (double) source_image->columns))
         {
           Quantum
             source[MaxPixelChannels];
@@ -2378,8 +2383,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
               Sc: source color.
               Dc: canvas color.
           */
-          (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset,source,
-            exception);
+          (void) GetOneVirtualPixel(source_image,
+            CastDoubleToLong(x-(double) x_offset),
+            CastDoubleToLong(y-(double) y_offset),source,exception);
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             MagickRealType

diff --git a/ImageMagick-7.1.1-20/MagickCore/composite.h → ImageMagick-7.1.1-21/MagickCore/composite.h b/ImageMagick-7.1.1-20/MagickCore/composite.h → ImageMagick-7.1.1-21/MagickCore/composite.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/compress.c → ImageMagick-7.1.1-21/MagickCore/compress.c b/ImageMagick-7.1.1-20/MagickCore/compress.c → ImageMagick-7.1.1-21/MagickCore/compress.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/compress.h → ImageMagick-7.1.1-21/MagickCore/compress.h b/ImageMagick-7.1.1-20/MagickCore/compress.h → ImageMagick-7.1.1-21/MagickCore/compress.h
diff --git a/...k-7.1.1-20/MagickCore/configure-private.h → ...k-7.1.1-21/MagickCore/configure-private.h b/...k-7.1.1-20/MagickCore/configure-private.h → ...k-7.1.1-21/MagickCore/configure-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/configure.c → ImageMagick-7.1.1-21/MagickCore/configure.c b/ImageMagick-7.1.1-20/MagickCore/configure.c → ImageMagick-7.1.1-21/MagickCore/configure.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/configure.h → ImageMagick-7.1.1-21/MagickCore/configure.h b/ImageMagick-7.1.1-20/MagickCore/configure.h → ImageMagick-7.1.1-21/MagickCore/configure.h
diff --git a/...-7.1.1-20/MagickCore/constitute-private.h → ...-7.1.1-21/MagickCore/constitute-private.h b/...-7.1.1-20/MagickCore/constitute-private.h → ...-7.1.1-21/MagickCore/constitute-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/constitute.c → ImageMagick-7.1.1-21/MagickCore/constitute.c b/ImageMagick-7.1.1-20/MagickCore/constitute.c → ImageMagick-7.1.1-21/MagickCore/constitute.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/constitute.h → ImageMagick-7.1.1-21/MagickCore/constitute.h b/ImageMagick-7.1.1-20/MagickCore/constitute.h → ImageMagick-7.1.1-21/MagickCore/constitute.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/decorate.c → ImageMagick-7.1.1-21/MagickCore/decorate.c b/ImageMagick-7.1.1-20/MagickCore/decorate.c → ImageMagick-7.1.1-21/MagickCore/decorate.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/decorate.h → ImageMagick-7.1.1-21/MagickCore/decorate.h b/ImageMagick-7.1.1-20/MagickCore/decorate.h → ImageMagick-7.1.1-21/MagickCore/decorate.h
diff --git a/...ck-7.1.1-20/MagickCore/delegate-private.h → ...ck-7.1.1-21/MagickCore/delegate-private.h b/...ck-7.1.1-20/MagickCore/delegate-private.h → ...ck-7.1.1-21/MagickCore/delegate-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/delegate.c → ImageMagick-7.1.1-21/MagickCore/delegate.c b/ImageMagick-7.1.1-20/MagickCore/delegate.c → ImageMagick-7.1.1-21/MagickCore/delegate.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/delegate.h → ImageMagick-7.1.1-21/MagickCore/delegate.h b/ImageMagick-7.1.1-20/MagickCore/delegate.h → ImageMagick-7.1.1-21/MagickCore/delegate.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/deprecate.c → ImageMagick-7.1.1-21/MagickCore/deprecate.c b/ImageMagick-7.1.1-20/MagickCore/deprecate.c → ImageMagick-7.1.1-21/MagickCore/deprecate.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/deprecate.h → ImageMagick-7.1.1-21/MagickCore/deprecate.h b/ImageMagick-7.1.1-20/MagickCore/deprecate.h → ImageMagick-7.1.1-21/MagickCore/deprecate.h
diff --git a/...ick-7.1.1-20/MagickCore/display-private.h → ...ick-7.1.1-21/MagickCore/display-private.h b/...ick-7.1.1-20/MagickCore/display-private.h → ...ick-7.1.1-21/MagickCore/display-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/display.c → ImageMagick-7.1.1-21/MagickCore/display.c b/ImageMagick-7.1.1-20/MagickCore/display.c → ImageMagick-7.1.1-21/MagickCore/display.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/display.h → ImageMagick-7.1.1-21/MagickCore/display.h b/ImageMagick-7.1.1-20/MagickCore/display.h → ImageMagick-7.1.1-21/MagickCore/display.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/distort.c → ImageMagick-7.1.1-21/MagickCore/distort.c b/ImageMagick-7.1.1-20/MagickCore/distort.c → ImageMagick-7.1.1-21/MagickCore/distort.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/distort.h → ImageMagick-7.1.1-21/MagickCore/distort.h b/ImageMagick-7.1.1-20/MagickCore/distort.h → ImageMagick-7.1.1-21/MagickCore/distort.h
diff --git a/...-20/MagickCore/distribute-cache-private.h → ...-21/MagickCore/distribute-cache-private.h b/...-20/MagickCore/distribute-cache-private.h → ...-21/MagickCore/distribute-cache-private.h
diff --git a/...ck-7.1.1-20/MagickCore/distribute-cache.c → ...ck-7.1.1-21/MagickCore/distribute-cache.c b/...ck-7.1.1-20/MagickCore/distribute-cache.c → ...ck-7.1.1-21/MagickCore/distribute-cache.c
diff --git a/...ck-7.1.1-20/MagickCore/distribute-cache.h → ...ck-7.1.1-21/MagickCore/distribute-cache.h b/...ck-7.1.1-20/MagickCore/distribute-cache.h → ...ck-7.1.1-21/MagickCore/distribute-cache.h
diff --git a/...Magick-7.1.1-20/MagickCore/draw-private.h → ...Magick-7.1.1-21/MagickCore/draw-private.h b/...Magick-7.1.1-20/MagickCore/draw-private.h → ...Magick-7.1.1-21/MagickCore/draw-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/draw.c → ImageMagick-7.1.1-21/MagickCore/draw.c b/ImageMagick-7.1.1-20/MagickCore/draw.c → ImageMagick-7.1.1-21/MagickCore/draw.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/draw.h → ImageMagick-7.1.1-21/MagickCore/draw.h b/ImageMagick-7.1.1-20/MagickCore/draw.h → ImageMagick-7.1.1-21/MagickCore/draw.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/effect.c → ImageMagick-7.1.1-21/MagickCore/effect.c b/ImageMagick-7.1.1-20/MagickCore/effect.c → ImageMagick-7.1.1-21/MagickCore/effect.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/effect.h → ImageMagick-7.1.1-21/MagickCore/effect.h b/ImageMagick-7.1.1-20/MagickCore/effect.h → ImageMagick-7.1.1-21/MagickCore/effect.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/enhance.c → ImageMagick-7.1.1-21/MagickCore/enhance.c b/ImageMagick-7.1.1-20/MagickCore/enhance.c → ImageMagick-7.1.1-21/MagickCore/enhance.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/enhance.h → ImageMagick-7.1.1-21/MagickCore/enhance.h b/ImageMagick-7.1.1-20/MagickCore/enhance.h → ImageMagick-7.1.1-21/MagickCore/enhance.h
diff --git a/...k-7.1.1-20/MagickCore/exception-private.h → ...k-7.1.1-21/MagickCore/exception-private.h b/...k-7.1.1-20/MagickCore/exception-private.h → ...k-7.1.1-21/MagickCore/exception-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/exception.c → ImageMagick-7.1.1-21/MagickCore/exception.c b/ImageMagick-7.1.1-20/MagickCore/exception.c → ImageMagick-7.1.1-21/MagickCore/exception.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/exception.h → ImageMagick-7.1.1-21/MagickCore/exception.h b/ImageMagick-7.1.1-20/MagickCore/exception.h → ImageMagick-7.1.1-21/MagickCore/exception.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/feature.c → ImageMagick-7.1.1-21/MagickCore/feature.c b/ImageMagick-7.1.1-20/MagickCore/feature.c → ImageMagick-7.1.1-21/MagickCore/feature.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/feature.h → ImageMagick-7.1.1-21/MagickCore/feature.h b/ImageMagick-7.1.1-20/MagickCore/feature.h → ImageMagick-7.1.1-21/MagickCore/feature.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/fourier.c → ImageMagick-7.1.1-21/MagickCore/fourier.c b/ImageMagick-7.1.1-20/MagickCore/fourier.c → ImageMagick-7.1.1-21/MagickCore/fourier.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/fourier.h → ImageMagick-7.1.1-21/MagickCore/fourier.h b/ImageMagick-7.1.1-20/MagickCore/fourier.h → ImageMagick-7.1.1-21/MagickCore/fourier.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/fx-private.h → ImageMagick-7.1.1-21/MagickCore/fx-private.h b/ImageMagick-7.1.1-20/MagickCore/fx-private.h → ImageMagick-7.1.1-21/MagickCore/fx-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/fx.c → ImageMagick-7.1.1-21/MagickCore/fx.c b/ImageMagick-7.1.1-20/MagickCore/fx.c → ImageMagick-7.1.1-21/MagickCore/fx.c
@@ -92,9 +92,9 @@
 #include "MagickCore/statistic.h"
 #include "MagickCore/statistic-private.h"
 #include "MagickCore/string_.h"
-#include "MagickCore/timer-private.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/threshold.h"
+#include "MagickCore/timer-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/transform-private.h"
@@ -655,7 +655,6 @@ typedef struct {
   fxFltType * ValStack;
   fxFltType * UserSymVals;
   Quantum * thisPixel;
-  MagickSizeType loopCount;
 } fxRtT;
 
 struct _FxInfo {
@@ -1000,8 +999,6 @@ static MagickBooleanType AllocFxRt (FxInfo * pfx, fxRtT * pfxrt)
     for (i = 0; i < pfx->usedUserSymbols; i++) pfxrt->UserSymVals[i] = (fxFltType) 0;
   }
 
-  pfxrt->loopCount = 0;
-
   return MagickTrue;
 }
 
@@ -3934,12 +3931,10 @@ static MagickBooleanType ExecuteRPN (FxInfo * pfx, fxRtT * pfxrt, fxFltType *res
         case rGotoChk:
           assert (pel->EleNdx >= 0);
           i = pel->EleNdx-1; /* -1 because 'for' loop will increment. */
-          if ((pfxrt->loopCount++ % 8192) == 0) {
-            if (GetMagickTTL() <= 0) {
-              i = pfx->usedElements-1; /* Do no more opcodes. */
-              (void) ThrowMagickException (pfx->exception, GetMagickModule(),
-                ResourceLimitFatalError, "TimeLimitExceeded", "`%s'", img->filename);
-            }
+          if (difftime(GetMagickTime(),img->timestamp) > (double) img->ttl) {
+            i = pfx->usedElements-1; /* Do no more opcodes. */
+            (void) ThrowMagickException (pfx->exception, GetMagickModule(),
+              ResourceLimitFatalError, "TimeLimitExceeded", "`%s'", img->filename);
           }
           break;
         case rIfZeroGoto:

diff --git a/ImageMagick-7.1.1-20/MagickCore/fx.h → ImageMagick-7.1.1-21/MagickCore/fx.h b/ImageMagick-7.1.1-20/MagickCore/fx.h → ImageMagick-7.1.1-21/MagickCore/fx.h
diff --git a/...eMagick-7.1.1-20/MagickCore/gem-private.h → ...eMagick-7.1.1-21/MagickCore/gem-private.h b/...eMagick-7.1.1-20/MagickCore/gem-private.h → ...eMagick-7.1.1-21/MagickCore/gem-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/gem.c → ImageMagick-7.1.1-21/MagickCore/gem.c b/ImageMagick-7.1.1-20/MagickCore/gem.c → ImageMagick-7.1.1-21/MagickCore/gem.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/gem.h → ImageMagick-7.1.1-21/MagickCore/gem.h b/ImageMagick-7.1.1-20/MagickCore/gem.h → ImageMagick-7.1.1-21/MagickCore/gem.h
diff --git a/...ck-7.1.1-20/MagickCore/geometry-private.h → ...ck-7.1.1-21/MagickCore/geometry-private.h b/...ck-7.1.1-20/MagickCore/geometry-private.h → ...ck-7.1.1-21/MagickCore/geometry-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/geometry.c → ImageMagick-7.1.1-21/MagickCore/geometry.c b/ImageMagick-7.1.1-20/MagickCore/geometry.c → ImageMagick-7.1.1-21/MagickCore/geometry.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/geometry.h → ImageMagick-7.1.1-21/MagickCore/geometry.h b/ImageMagick-7.1.1-20/MagickCore/geometry.h → ImageMagick-7.1.1-21/MagickCore/geometry.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/histogram.c → ImageMagick-7.1.1-21/MagickCore/histogram.c b/ImageMagick-7.1.1-20/MagickCore/histogram.c → ImageMagick-7.1.1-21/MagickCore/histogram.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/histogram.h → ImageMagick-7.1.1-21/MagickCore/histogram.h b/ImageMagick-7.1.1-20/MagickCore/histogram.h → ImageMagick-7.1.1-21/MagickCore/histogram.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/identify.c → ImageMagick-7.1.1-21/MagickCore/identify.c b/ImageMagick-7.1.1-20/MagickCore/identify.c → ImageMagick-7.1.1-21/MagickCore/identify.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/identify.h → ImageMagick-7.1.1-21/MagickCore/identify.h b/ImageMagick-7.1.1-20/MagickCore/identify.h → ImageMagick-7.1.1-21/MagickCore/identify.h
diff --git a/...agick-7.1.1-20/MagickCore/image-private.h → ...agick-7.1.1-21/MagickCore/image-private.h b/...agick-7.1.1-20/MagickCore/image-private.h → ...agick-7.1.1-21/MagickCore/image-private.h
@@ -111,7 +111,7 @@ static inline size_t CastDoubleToUnsigned(const double x)
       errno=ERANGE;
       return(0);
     }
-  if (floor(x) > ((double) MAGICK_SSIZE_MAX-1))
+  if (floor(x) > ((double) MAGICK_SIZE_MAX-1))
     {
       errno=ERANGE;
       return((size_t) MAGICK_SIZE_MAX);

diff --git a/ImageMagick-7.1.1-20/MagickCore/image-view.c → ImageMagick-7.1.1-21/MagickCore/image-view.c b/ImageMagick-7.1.1-20/MagickCore/image-view.c → ImageMagick-7.1.1-21/MagickCore/image-view.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/image-view.h → ImageMagick-7.1.1-21/MagickCore/image-view.h b/ImageMagick-7.1.1-20/MagickCore/image-view.h → ImageMagick-7.1.1-21/MagickCore/image-view.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/image.c → ImageMagick-7.1.1-21/MagickCore/image.c b/ImageMagick-7.1.1-20/MagickCore/image.c → ImageMagick-7.1.1-21/MagickCore/image.c
@@ -184,6 +184,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
   image->channel_map=AcquirePixelChannelMap();
   image->blob=CloneBlobInfo((BlobInfo *) NULL);
   image->timestamp=GetMagickTime();
+  image->ttl=(time_t) GetMagickResourceLimit(TimeResource);
   image->debug=(GetLogEventMask() & (ImageEvent | TransformEvent | CoderEvent))
     != 0 ? MagickTrue : MagickFalse;
   image->reference_count=1;
@@ -857,6 +858,8 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
       clone_image->blob=CloneBlobInfo((BlobInfo *) NULL);
     }
   clone_image->ping=image->ping;
+  clone_image->timestamp=image->timestamp;
+  clone_image->ttl=image->ttl;
   clone_image->debug=image->debug;
   clone_image->semaphore=AcquireSemaphoreInfo();
   if (image->colormap != (PixelInfo *) NULL)

diff --git a/ImageMagick-7.1.1-20/MagickCore/image.h → ImageMagick-7.1.1-21/MagickCore/image.h b/ImageMagick-7.1.1-20/MagickCore/image.h → ImageMagick-7.1.1-21/MagickCore/image.h
@@ -364,6 +364,9 @@ struct _Image
 
   ChannelType
     channels;
+
+  time_t
+    ttl;
 };
 
 /*

diff --git a/ImageMagick-7.1.1-20/MagickCore/layer.c → ImageMagick-7.1.1-21/MagickCore/layer.c b/ImageMagick-7.1.1-20/MagickCore/layer.c → ImageMagick-7.1.1-21/MagickCore/layer.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/layer.h → ImageMagick-7.1.1-21/MagickCore/layer.h b/ImageMagick-7.1.1-20/MagickCore/layer.h → ImageMagick-7.1.1-21/MagickCore/layer.h
diff --git a/...7.1.1-20/MagickCore/linked-list-private.h → ...7.1.1-21/MagickCore/linked-list-private.h b/...7.1.1-20/MagickCore/linked-list-private.h → ...7.1.1-21/MagickCore/linked-list-private.h
diff --git a/...eMagick-7.1.1-20/MagickCore/linked-list.c → ...eMagick-7.1.1-21/MagickCore/linked-list.c b/...eMagick-7.1.1-20/MagickCore/linked-list.c → ...eMagick-7.1.1-21/MagickCore/linked-list.c
diff --git a/...eMagick-7.1.1-20/MagickCore/linked-list.h → ...eMagick-7.1.1-21/MagickCore/linked-list.h b/...eMagick-7.1.1-20/MagickCore/linked-list.h → ...eMagick-7.1.1-21/MagickCore/linked-list.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/list.c → ImageMagick-7.1.1-21/MagickCore/list.c b/ImageMagick-7.1.1-20/MagickCore/list.c → ImageMagick-7.1.1-21/MagickCore/list.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/list.h → ImageMagick-7.1.1-21/MagickCore/list.h b/ImageMagick-7.1.1-20/MagickCore/list.h → ImageMagick-7.1.1-21/MagickCore/list.h
diff --git a/...gick-7.1.1-20/MagickCore/locale-private.h → ...gick-7.1.1-21/MagickCore/locale-private.h b/...gick-7.1.1-20/MagickCore/locale-private.h → ...gick-7.1.1-21/MagickCore/locale-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/locale.c → ImageMagick-7.1.1-21/MagickCore/locale.c b/ImageMagick-7.1.1-20/MagickCore/locale.c → ImageMagick-7.1.1-21/MagickCore/locale.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/locale_.h → ImageMagick-7.1.1-21/MagickCore/locale_.h b/ImageMagick-7.1.1-20/MagickCore/locale_.h → ImageMagick-7.1.1-21/MagickCore/locale_.h
diff --git a/...eMagick-7.1.1-20/MagickCore/log-private.h → ...eMagick-7.1.1-21/MagickCore/log-private.h b/...eMagick-7.1.1-20/MagickCore/log-private.h → ...eMagick-7.1.1-21/MagickCore/log-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/log.c → ImageMagick-7.1.1-21/MagickCore/log.c b/ImageMagick-7.1.1-20/MagickCore/log.c → ImageMagick-7.1.1-21/MagickCore/log.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/log.h → ImageMagick-7.1.1-21/MagickCore/log.h b/ImageMagick-7.1.1-20/MagickCore/log.h → ImageMagick-7.1.1-21/MagickCore/log.h
diff --git a/...agick-7.1.1-20/MagickCore/magic-private.h → ...agick-7.1.1-21/MagickCore/magic-private.h b/...agick-7.1.1-20/MagickCore/magic-private.h → ...agick-7.1.1-21/MagickCore/magic-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/magic.c → ImageMagick-7.1.1-21/MagickCore/magic.c b/ImageMagick-7.1.1-20/MagickCore/magic.c → ImageMagick-7.1.1-21/MagickCore/magic.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/magic.h → ImageMagick-7.1.1-21/MagickCore/magic.h b/ImageMagick-7.1.1-20/MagickCore/magic.h → ImageMagick-7.1.1-21/MagickCore/magic.h
diff --git a/...agick-7.1.1-20/MagickCore/magick-config.h → ...agick-7.1.1-21/MagickCore/magick-config.h b/...agick-7.1.1-20/MagickCore/magick-config.h → ...agick-7.1.1-21/MagickCore/magick-config.h
diff --git a/...gick-7.1.1-20/MagickCore/magick-private.h → ...gick-7.1.1-21/MagickCore/magick-private.h b/...gick-7.1.1-20/MagickCore/magick-private.h → ...gick-7.1.1-21/MagickCore/magick-private.h
diff --git a/...eMagick-7.1.1-20/MagickCore/magick-type.h → ...eMagick-7.1.1-21/MagickCore/magick-type.h b/...eMagick-7.1.1-20/MagickCore/magick-type.h → ...eMagick-7.1.1-21/MagickCore/magick-type.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/magick.c → ImageMagick-7.1.1-21/MagickCore/magick.c b/ImageMagick-7.1.1-20/MagickCore/magick.c → ImageMagick-7.1.1-21/MagickCore/magick.c
@@ -1591,7 +1591,6 @@ MagickExport void MagickCoreGenesis(const char *path,
 #endif
   (void) RegistryComponentGenesis();
   (void) MonitorComponentGenesis();
-  (void) GetMagickTTL();
   magickcore_instantiated=MagickTrue;
   UnlockMagickMutex();
 }

diff --git a/ImageMagick-7.1.1-20/MagickCore/magick.h → ImageMagick-7.1.1-21/MagickCore/magick.h b/ImageMagick-7.1.1-20/MagickCore/magick.h → ImageMagick-7.1.1-21/MagickCore/magick.h
diff --git a/...gick-7.1.1-20/MagickCore/matrix-private.h → ...gick-7.1.1-21/MagickCore/matrix-private.h b/...gick-7.1.1-20/MagickCore/matrix-private.h → ...gick-7.1.1-21/MagickCore/matrix-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/matrix.c → ImageMagick-7.1.1-21/MagickCore/matrix.c b/ImageMagick-7.1.1-20/MagickCore/matrix.c → ImageMagick-7.1.1-21/MagickCore/matrix.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/matrix.h → ImageMagick-7.1.1-21/MagickCore/matrix.h b/ImageMagick-7.1.1-20/MagickCore/matrix.h → ImageMagick-7.1.1-21/MagickCore/matrix.h
diff --git a/...gick-7.1.1-20/MagickCore/memory-private.h → ...gick-7.1.1-21/MagickCore/memory-private.h b/...gick-7.1.1-20/MagickCore/memory-private.h → ...gick-7.1.1-21/MagickCore/memory-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/memory.c → ImageMagick-7.1.1-21/MagickCore/memory.c b/ImageMagick-7.1.1-20/MagickCore/memory.c → ImageMagick-7.1.1-21/MagickCore/memory.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/memory_.h → ImageMagick-7.1.1-21/MagickCore/memory_.h b/ImageMagick-7.1.1-20/MagickCore/memory_.h → ImageMagick-7.1.1-21/MagickCore/memory_.h
diff --git a/...ck-7.1.1-20/MagickCore/method-attribute.h → ...ck-7.1.1-21/MagickCore/method-attribute.h b/...ck-7.1.1-20/MagickCore/method-attribute.h → ...ck-7.1.1-21/MagickCore/method-attribute.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/methods.h → ImageMagick-7.1.1-21/MagickCore/methods.h b/ImageMagick-7.1.1-20/MagickCore/methods.h → ImageMagick-7.1.1-21/MagickCore/methods.h
diff --git a/...Magick-7.1.1-20/MagickCore/mime-private.h → ...Magick-7.1.1-21/MagickCore/mime-private.h b/...Magick-7.1.1-20/MagickCore/mime-private.h → ...Magick-7.1.1-21/MagickCore/mime-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/mime.c → ImageMagick-7.1.1-21/MagickCore/mime.c b/ImageMagick-7.1.1-20/MagickCore/mime.c → ImageMagick-7.1.1-21/MagickCore/mime.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/mime.h → ImageMagick-7.1.1-21/MagickCore/mime.h b/ImageMagick-7.1.1-20/MagickCore/mime.h → ImageMagick-7.1.1-21/MagickCore/mime.h
diff --git a/...gick-7.1.1-20/MagickCore/module-private.h → ...gick-7.1.1-21/MagickCore/module-private.h b/...gick-7.1.1-20/MagickCore/module-private.h → ...gick-7.1.1-21/MagickCore/module-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/module.c → ImageMagick-7.1.1-21/MagickCore/module.c b/ImageMagick-7.1.1-20/MagickCore/module.c → ImageMagick-7.1.1-21/MagickCore/module.c
@@ -62,6 +62,7 @@
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/timer-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
@@ -147,7 +148,7 @@ MagickExport ModuleInfo *AcquireModuleInfo(const char *path,const char *tag)
     module_info->path=ConstantString(path);
   if (tag != (const char *) NULL)
     module_info->tag=ConstantString(tag);
-  module_info->timestamp=time(0);
+  module_info->timestamp=GetMagickTime();
   module_info->signature=MagickCoreSignature;
   return(module_info);
 }

diff --git a/ImageMagick-7.1.1-20/MagickCore/module.h → ImageMagick-7.1.1-21/MagickCore/module.h b/ImageMagick-7.1.1-20/MagickCore/module.h → ImageMagick-7.1.1-21/MagickCore/module.h
diff --git a/...ick-7.1.1-20/MagickCore/monitor-private.h → ...ick-7.1.1-21/MagickCore/monitor-private.h b/...ick-7.1.1-20/MagickCore/monitor-private.h → ...ick-7.1.1-21/MagickCore/monitor-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/monitor.c → ImageMagick-7.1.1-21/MagickCore/monitor.c b/ImageMagick-7.1.1-20/MagickCore/monitor.c → ImageMagick-7.1.1-21/MagickCore/monitor.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/monitor.h → ImageMagick-7.1.1-21/MagickCore/monitor.h b/ImageMagick-7.1.1-20/MagickCore/monitor.h → ImageMagick-7.1.1-21/MagickCore/monitor.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/montage.c → ImageMagick-7.1.1-21/MagickCore/montage.c b/ImageMagick-7.1.1-20/MagickCore/montage.c → ImageMagick-7.1.1-21/MagickCore/montage.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/montage.h → ImageMagick-7.1.1-21/MagickCore/montage.h b/ImageMagick-7.1.1-20/MagickCore/montage.h → ImageMagick-7.1.1-21/MagickCore/montage.h
diff --git a/...-7.1.1-20/MagickCore/morphology-private.h → ...-7.1.1-21/MagickCore/morphology-private.h b/...-7.1.1-20/MagickCore/morphology-private.h → ...-7.1.1-21/MagickCore/morphology-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/morphology.c → ImageMagick-7.1.1-21/MagickCore/morphology.c b/ImageMagick-7.1.1-20/MagickCore/morphology.c → ImageMagick-7.1.1-21/MagickCore/morphology.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/morphology.h → ImageMagick-7.1.1-21/MagickCore/morphology.h b/ImageMagick-7.1.1-20/MagickCore/morphology.h → ImageMagick-7.1.1-21/MagickCore/morphology.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/mutex.h → ImageMagick-7.1.1-21/MagickCore/mutex.h b/ImageMagick-7.1.1-20/MagickCore/mutex.h → ImageMagick-7.1.1-21/MagickCore/mutex.h
diff --git a/...ick-7.1.1-20/MagickCore/nt-base-private.h → ...ick-7.1.1-21/MagickCore/nt-base-private.h b/...ick-7.1.1-20/MagickCore/nt-base-private.h → ...ick-7.1.1-21/MagickCore/nt-base-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/nt-base.c → ImageMagick-7.1.1-21/MagickCore/nt-base.c b/ImageMagick-7.1.1-20/MagickCore/nt-base.c → ImageMagick-7.1.1-21/MagickCore/nt-base.c
@@ -987,12 +987,10 @@ static int NTLocateGhostscript(DWORD flags,int *root_index,
     status;
 
   static const char
-    *products[4] =
+    *products[2] =
     {
-      "GPL Ghostscript",
-      "GNU Ghostscript",
-      "AFPL Ghostscript",
-      "Aladdin Ghostscript"
+      "Artifex Ghostscript",
+      "GPL Ghostscript"
     };
 
   /*

diff --git a/ImageMagick-7.1.1-20/MagickCore/nt-base.h → ImageMagick-7.1.1-21/MagickCore/nt-base.h b/ImageMagick-7.1.1-20/MagickCore/nt-base.h → ImageMagick-7.1.1-21/MagickCore/nt-base.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/nt-feature.c → ImageMagick-7.1.1-21/MagickCore/nt-feature.c b/ImageMagick-7.1.1-20/MagickCore/nt-feature.c → ImageMagick-7.1.1-21/MagickCore/nt-feature.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/nt-feature.h → ImageMagick-7.1.1-21/MagickCore/nt-feature.h b/ImageMagick-7.1.1-20/MagickCore/nt-feature.h → ImageMagick-7.1.1-21/MagickCore/nt-feature.h
diff --git a/...gick-7.1.1-20/MagickCore/opencl-private.h → ...gick-7.1.1-21/MagickCore/opencl-private.h b/...gick-7.1.1-20/MagickCore/opencl-private.h → ...gick-7.1.1-21/MagickCore/opencl-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/opencl.c → ImageMagick-7.1.1-21/MagickCore/opencl.c b/ImageMagick-7.1.1-20/MagickCore/opencl.c → ImageMagick-7.1.1-21/MagickCore/opencl.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/opencl.h → ImageMagick-7.1.1-21/MagickCore/opencl.h b/ImageMagick-7.1.1-20/MagickCore/opencl.h → ImageMagick-7.1.1-21/MagickCore/opencl.h
diff --git a/...gick-7.1.1-20/MagickCore/option-private.h → ...gick-7.1.1-21/MagickCore/option-private.h b/...gick-7.1.1-20/MagickCore/option-private.h → ...gick-7.1.1-21/MagickCore/option-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/option.c → ImageMagick-7.1.1-21/MagickCore/option.c b/ImageMagick-7.1.1-20/MagickCore/option.c → ImageMagick-7.1.1-21/MagickCore/option.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/option.h → ImageMagick-7.1.1-21/MagickCore/option.h b/ImageMagick-7.1.1-20/MagickCore/option.h → ImageMagick-7.1.1-21/MagickCore/option.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/paint.c → ImageMagick-7.1.1-21/MagickCore/paint.c b/ImageMagick-7.1.1-20/MagickCore/paint.c → ImageMagick-7.1.1-21/MagickCore/paint.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/paint.h → ImageMagick-7.1.1-21/MagickCore/paint.h b/ImageMagick-7.1.1-20/MagickCore/paint.h → ImageMagick-7.1.1-21/MagickCore/paint.h
diff --git a/...gick-7.1.1-20/MagickCore/pixel-accessor.h → ...gick-7.1.1-21/MagickCore/pixel-accessor.h b/...gick-7.1.1-20/MagickCore/pixel-accessor.h → ...gick-7.1.1-21/MagickCore/pixel-accessor.h
diff --git a/...agick-7.1.1-20/MagickCore/pixel-private.h → ...agick-7.1.1-21/MagickCore/pixel-private.h b/...agick-7.1.1-20/MagickCore/pixel-private.h → ...agick-7.1.1-21/MagickCore/pixel-private.h
diff --git a/ImageMagick-7.1.1-20/MagickCore/pixel.c → ImageMagick-7.1.1-21/MagickCore/pixel.c b/ImageMagick-7.1.1-20/MagickCore/pixel.c → ImageMagick-7.1.1-21/MagickCore/pixel.c
diff --git a/ImageMagick-7.1.1-20/MagickCore/pixel.h → ImageMagick-7.1.1-21/MagickCore/pixel.h b/ImageMagick-7.1.1-20/MagickCore/pixel.h → ImageMagick-7.1.1-21/MagickCore/pixel.h
diff --git a/...gick-7.1.1-20/MagickCore/policy-private.h → ...gick-7.1.1-21/MagickCore/policy-private.h b/...gick-7.1.1-20/MagickCore/policy-private.h → ...gick-7.1.1-21/MagickCore/policy-private.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -364,6 +364,9 @@ struct _Image @@
       ChannelType
         channels;
+      time_t
+        ttl;
     };
     /*
@@ Expand Down @@