MolotovCherry · MolotovCherry · Aug 13, 2025 · Aug 13, 2025
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.2-0
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.2-1
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2

diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Blob.cpp → ImageMagick-7.1.2-1/Magick++/lib/Blob.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Blob.cpp → ImageMagick-7.1.2-1/Magick++/lib/Blob.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/BlobRef.cpp → ImageMagick-7.1.2-1/Magick++/lib/BlobRef.cpp b/ImageMagick-7.1.2-0/Magick++/lib/BlobRef.cpp → ImageMagick-7.1.2-1/Magick++/lib/BlobRef.cpp
diff --git a/...Magick-7.1.2-0/Magick++/lib/CoderInfo.cpp → ...Magick-7.1.2-1/Magick++/lib/CoderInfo.cpp b/...Magick-7.1.2-0/Magick++/lib/CoderInfo.cpp → ...Magick-7.1.2-1/Magick++/lib/CoderInfo.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Color.cpp → ImageMagick-7.1.2-1/Magick++/lib/Color.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Color.cpp → ImageMagick-7.1.2-1/Magick++/lib/Color.cpp
diff --git a/...eMagick-7.1.2-0/Magick++/lib/Drawable.cpp → ...eMagick-7.1.2-1/Magick++/lib/Drawable.cpp b/...eMagick-7.1.2-0/Magick++/lib/Drawable.cpp → ...eMagick-7.1.2-1/Magick++/lib/Drawable.cpp
diff --git a/...Magick-7.1.2-0/Magick++/lib/Exception.cpp → ...Magick-7.1.2-1/Magick++/lib/Exception.cpp b/...Magick-7.1.2-0/Magick++/lib/Exception.cpp → ...Magick-7.1.2-1/Magick++/lib/Exception.cpp
diff --git a/...Magick-7.1.2-0/Magick++/lib/Functions.cpp → ...Magick-7.1.2-1/Magick++/lib/Functions.cpp b/...Magick-7.1.2-0/Magick++/lib/Functions.cpp → ...Magick-7.1.2-1/Magick++/lib/Functions.cpp
diff --git a/...eMagick-7.1.2-0/Magick++/lib/Geometry.cpp → ...eMagick-7.1.2-1/Magick++/lib/Geometry.cpp b/...eMagick-7.1.2-0/Magick++/lib/Geometry.cpp → ...eMagick-7.1.2-1/Magick++/lib/Geometry.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Image.cpp → ImageMagick-7.1.2-1/Magick++/lib/Image.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Image.cpp → ImageMagick-7.1.2-1/Magick++/lib/Image.cpp
diff --git a/...eMagick-7.1.2-0/Magick++/lib/ImageRef.cpp → ...eMagick-7.1.2-1/Magick++/lib/ImageRef.cpp b/...eMagick-7.1.2-0/Magick++/lib/ImageRef.cpp → ...eMagick-7.1.2-1/Magick++/lib/ImageRef.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++.h → ImageMagick-7.1.2-1/Magick++/lib/Magick++.h b/ImageMagick-7.1.2-0/Magick++/lib/Magick++.h → ImageMagick-7.1.2-1/Magick++/lib/Magick++.h
diff --git a/...gick-7.1.2-0/Magick++/lib/Magick++/Blob.h → ...gick-7.1.2-1/Magick++/lib/Magick++/Blob.h b/...gick-7.1.2-0/Magick++/lib/Magick++/Blob.h → ...gick-7.1.2-1/Magick++/lib/Magick++/Blob.h
diff --git a/...k-7.1.2-0/Magick++/lib/Magick++/BlobRef.h → ...k-7.1.2-1/Magick++/lib/Magick++/BlobRef.h b/...k-7.1.2-0/Magick++/lib/Magick++/BlobRef.h → ...k-7.1.2-1/Magick++/lib/Magick++/BlobRef.h
diff --git a/...7.1.2-0/Magick++/lib/Magick++/CoderInfo.h → ...7.1.2-1/Magick++/lib/Magick++/CoderInfo.h b/...7.1.2-0/Magick++/lib/Magick++/CoderInfo.h → ...7.1.2-1/Magick++/lib/Magick++/CoderInfo.h
diff --git a/...ick-7.1.2-0/Magick++/lib/Magick++/Color.h → ...ick-7.1.2-1/Magick++/lib/Magick++/Color.h b/...ick-7.1.2-0/Magick++/lib/Magick++/Color.h → ...ick-7.1.2-1/Magick++/lib/Magick++/Color.h
diff --git a/...-7.1.2-0/Magick++/lib/Magick++/Drawable.h → ...-7.1.2-1/Magick++/lib/Magick++/Drawable.h b/...-7.1.2-0/Magick++/lib/Magick++/Drawable.h → ...-7.1.2-1/Magick++/lib/Magick++/Drawable.h
diff --git a/...7.1.2-0/Magick++/lib/Magick++/Exception.h → ...7.1.2-1/Magick++/lib/Magick++/Exception.h b/...7.1.2-0/Magick++/lib/Magick++/Exception.h → ...7.1.2-1/Magick++/lib/Magick++/Exception.h
diff --git a/...7.1.2-0/Magick++/lib/Magick++/Functions.h → ...7.1.2-1/Magick++/lib/Magick++/Functions.h b/...7.1.2-0/Magick++/lib/Magick++/Functions.h → ...7.1.2-1/Magick++/lib/Magick++/Functions.h
diff --git a/...-7.1.2-0/Magick++/lib/Magick++/Geometry.h → ...-7.1.2-1/Magick++/lib/Magick++/Geometry.h b/...-7.1.2-0/Magick++/lib/Magick++/Geometry.h → ...-7.1.2-1/Magick++/lib/Magick++/Geometry.h
diff --git a/...ick-7.1.2-0/Magick++/lib/Magick++/Image.h → ...ick-7.1.2-1/Magick++/lib/Magick++/Image.h b/...ick-7.1.2-0/Magick++/lib/Magick++/Image.h → ...ick-7.1.2-1/Magick++/lib/Magick++/Image.h
diff --git a/...-7.1.2-0/Magick++/lib/Magick++/ImageRef.h → ...-7.1.2-1/Magick++/lib/Magick++/ImageRef.h b/...-7.1.2-0/Magick++/lib/Magick++/ImageRef.h → ...-7.1.2-1/Magick++/lib/Magick++/ImageRef.h
diff --git a/...k-7.1.2-0/Magick++/lib/Magick++/Include.h → ...k-7.1.2-1/Magick++/lib/Magick++/Include.h b/...k-7.1.2-0/Magick++/lib/Magick++/Include.h → ...k-7.1.2-1/Magick++/lib/Magick++/Include.h
diff --git a/...k-7.1.2-0/Magick++/lib/Magick++/Montage.h → ...k-7.1.2-1/Magick++/lib/Magick++/Montage.h b/...k-7.1.2-0/Magick++/lib/Magick++/Montage.h → ...k-7.1.2-1/Magick++/lib/Magick++/Montage.h
diff --git a/...k-7.1.2-0/Magick++/lib/Magick++/Options.h → ...k-7.1.2-1/Magick++/lib/Magick++/Options.h b/...k-7.1.2-0/Magick++/lib/Magick++/Options.h → ...k-7.1.2-1/Magick++/lib/Magick++/Options.h
diff --git a/...ck-7.1.2-0/Magick++/lib/Magick++/Pixels.h → ...ck-7.1.2-1/Magick++/lib/Magick++/Pixels.h b/...ck-7.1.2-0/Magick++/lib/Magick++/Pixels.h → ...ck-7.1.2-1/Magick++/lib/Magick++/Pixels.h
diff --git a/...-0/Magick++/lib/Magick++/ResourceLimits.h → ...-1/Magick++/lib/Magick++/ResourceLimits.h b/...-0/Magick++/lib/Magick++/ResourceLimits.h → ...-1/Magick++/lib/Magick++/ResourceLimits.h
diff --git a/...agick-7.1.2-0/Magick++/lib/Magick++/STL.h → ...agick-7.1.2-1/Magick++/lib/Magick++/STL.h b/...agick-7.1.2-0/Magick++/lib/Magick++/STL.h → ...agick-7.1.2-1/Magick++/lib/Magick++/STL.h
diff --git a/...-0/Magick++/lib/Magick++/SecurityPolicy.h → ...-1/Magick++/lib/Magick++/SecurityPolicy.h b/...-0/Magick++/lib/Magick++/SecurityPolicy.h → ...-1/Magick++/lib/Magick++/SecurityPolicy.h
diff --git a/...7.1.2-0/Magick++/lib/Magick++/Statistic.h → ...7.1.2-1/Magick++/lib/Magick++/Statistic.h b/...7.1.2-0/Magick++/lib/Magick++/Statistic.h → ...7.1.2-1/Magick++/lib/Magick++/Statistic.h
diff --git a/...ck-7.1.2-0/Magick++/lib/Magick++/Thread.h → ...ck-7.1.2-1/Magick++/lib/Magick++/Thread.h b/...ck-7.1.2-0/Magick++/lib/Magick++/Thread.h → ...ck-7.1.2-1/Magick++/lib/Magick++/Thread.h
diff --git a/....1.2-0/Magick++/lib/Magick++/TypeMetric.h → ....1.2-1/Magick++/lib/Magick++/TypeMetric.h b/....1.2-0/Magick++/lib/Magick++/TypeMetric.h → ....1.2-1/Magick++/lib/Magick++/TypeMetric.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Montage.cpp → ImageMagick-7.1.2-1/Magick++/lib/Montage.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Montage.cpp → ImageMagick-7.1.2-1/Magick++/lib/Montage.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Options.cpp → ImageMagick-7.1.2-1/Magick++/lib/Options.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Options.cpp → ImageMagick-7.1.2-1/Magick++/lib/Options.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Pixels.cpp → ImageMagick-7.1.2-1/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Pixels.cpp → ImageMagick-7.1.2-1/Magick++/lib/Pixels.cpp
diff --git a/...k-7.1.2-0/Magick++/lib/ResourceLimits.cpp → ...k-7.1.2-1/Magick++/lib/ResourceLimits.cpp b/...k-7.1.2-0/Magick++/lib/ResourceLimits.cpp → ...k-7.1.2-1/Magick++/lib/ResourceLimits.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/STL.cpp → ImageMagick-7.1.2-1/Magick++/lib/STL.cpp b/ImageMagick-7.1.2-0/Magick++/lib/STL.cpp → ImageMagick-7.1.2-1/Magick++/lib/STL.cpp
diff --git a/...k-7.1.2-0/Magick++/lib/SecurityPolicy.cpp → ...k-7.1.2-1/Magick++/lib/SecurityPolicy.cpp b/...k-7.1.2-0/Magick++/lib/SecurityPolicy.cpp → ...k-7.1.2-1/Magick++/lib/SecurityPolicy.cpp
diff --git a/...Magick-7.1.2-0/Magick++/lib/Statistic.cpp → ...Magick-7.1.2-1/Magick++/lib/Statistic.cpp b/...Magick-7.1.2-0/Magick++/lib/Statistic.cpp → ...Magick-7.1.2-1/Magick++/lib/Statistic.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Thread.cpp → ImageMagick-7.1.2-1/Magick++/lib/Thread.cpp b/ImageMagick-7.1.2-0/Magick++/lib/Thread.cpp → ImageMagick-7.1.2-1/Magick++/lib/Thread.cpp
diff --git a/...agick-7.1.2-0/Magick++/lib/TypeMetric.cpp → ...agick-7.1.2-1/Magick++/lib/TypeMetric.cpp b/...agick-7.1.2-0/Magick++/lib/TypeMetric.cpp → ...agick-7.1.2-1/Magick++/lib/TypeMetric.cpp
diff --git a/ImageMagick-7.1.2-0/MagickCore/MagickCore.h → ImageMagick-7.1.2-1/MagickCore/MagickCore.h b/ImageMagick-7.1.2-0/MagickCore/MagickCore.h → ImageMagick-7.1.2-1/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/...k-7.1.2-0/MagickCore/accelerate-private.h → ...k-7.1.2-1/MagickCore/accelerate-private.h b/...k-7.1.2-0/MagickCore/accelerate-private.h → ...k-7.1.2-1/MagickCore/accelerate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/accelerate.c → ImageMagick-7.1.2-1/MagickCore/accelerate.c b/ImageMagick-7.1.2-0/MagickCore/accelerate.c → ImageMagick-7.1.2-1/MagickCore/accelerate.c
diff --git a/...gick-7.1.2-0/MagickCore/animate-private.h → ...gick-7.1.2-1/MagickCore/animate-private.h b/...gick-7.1.2-0/MagickCore/animate-private.h → ...gick-7.1.2-1/MagickCore/animate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/animate.c → ImageMagick-7.1.2-1/MagickCore/animate.c b/ImageMagick-7.1.2-0/MagickCore/animate.c → ImageMagick-7.1.2-1/MagickCore/animate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/animate.h → ImageMagick-7.1.2-1/MagickCore/animate.h b/ImageMagick-7.1.2-0/MagickCore/animate.h → ImageMagick-7.1.2-1/MagickCore/animate.h
diff --git a/...ick-7.1.2-0/MagickCore/annotate-private.h → ...ick-7.1.2-1/MagickCore/annotate-private.h b/...ick-7.1.2-0/MagickCore/annotate-private.h → ...ick-7.1.2-1/MagickCore/annotate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/annotate.c → ImageMagick-7.1.2-1/MagickCore/annotate.c b/ImageMagick-7.1.2-0/MagickCore/annotate.c → ImageMagick-7.1.2-1/MagickCore/annotate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/annotate.h → ImageMagick-7.1.2-1/MagickCore/annotate.h b/ImageMagick-7.1.2-0/MagickCore/annotate.h → ImageMagick-7.1.2-1/MagickCore/annotate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/artifact.c → ImageMagick-7.1.2-1/MagickCore/artifact.c b/ImageMagick-7.1.2-0/MagickCore/artifact.c → ImageMagick-7.1.2-1/MagickCore/artifact.c
@@ -99,6 +99,21 @@
 %    o clone_image: the source image for artifacts to clone.
 %
 */
+
+typedef char
+  *(*CloneKeyFunc)(const char *),
+  *(*CloneValueFunc)(const char *);
+
+static inline void *CloneArtifactKey(void *key)
+{
+  return((void *) ((CloneKeyFunc) ConstantString)((const char *) key));
+}
+
+static inline void *CloneArtifactValue(void *value)
+{
+  return((void *) ((CloneValueFunc) ConstantString)((const char *) value));
+}
+
 MagickExport MagickBooleanType CloneImageArtifacts(Image *image,
   const Image *clone_image)
 {
@@ -117,7 +132,7 @@ MagickExport MagickBooleanType CloneImageArtifacts(Image *image,
       if (image->artifacts != (void *) NULL)
         DestroyImageArtifacts(image);
       image->artifacts=CloneSplayTree((SplayTreeInfo *) clone_image->artifacts,
-        (void *(*)(void *)) ConstantString,(void *(*)(void *)) ConstantString);
+        CloneArtifactKey,CloneArtifactValue);
     }
   return(MagickTrue);
 }

diff --git a/ImageMagick-7.1.2-0/MagickCore/artifact.h → ImageMagick-7.1.2-1/MagickCore/artifact.h b/ImageMagick-7.1.2-0/MagickCore/artifact.h → ImageMagick-7.1.2-1/MagickCore/artifact.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/attribute.c → ImageMagick-7.1.2-1/MagickCore/attribute.c b/ImageMagick-7.1.2-0/MagickCore/attribute.c → ImageMagick-7.1.2-1/MagickCore/attribute.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/attribute.h → ImageMagick-7.1.2-1/MagickCore/attribute.h b/ImageMagick-7.1.2-0/MagickCore/attribute.h → ImageMagick-7.1.2-1/MagickCore/attribute.h
diff --git a/...eMagick-7.1.2-0/MagickCore/blob-private.h → ...eMagick-7.1.2-1/MagickCore/blob-private.h b/...eMagick-7.1.2-0/MagickCore/blob-private.h → ...eMagick-7.1.2-1/MagickCore/blob-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/blob.c → ImageMagick-7.1.2-1/MagickCore/blob.c b/ImageMagick-7.1.2-0/MagickCore/blob.c → ImageMagick-7.1.2-1/MagickCore/blob.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/blob.h → ImageMagick-7.1.2-1/MagickCore/blob.h b/ImageMagick-7.1.2-0/MagickCore/blob.h → ImageMagick-7.1.2-1/MagickCore/blob.h
diff --git a/...Magick-7.1.2-0/MagickCore/cache-private.h → ...Magick-7.1.2-1/MagickCore/cache-private.h b/...Magick-7.1.2-0/MagickCore/cache-private.h → ...Magick-7.1.2-1/MagickCore/cache-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache-view.c → ImageMagick-7.1.2-1/MagickCore/cache-view.c b/ImageMagick-7.1.2-0/MagickCore/cache-view.c → ImageMagick-7.1.2-1/MagickCore/cache-view.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache-view.h → ImageMagick-7.1.2-1/MagickCore/cache-view.h b/ImageMagick-7.1.2-0/MagickCore/cache-view.h → ImageMagick-7.1.2-1/MagickCore/cache-view.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache.c → ImageMagick-7.1.2-1/MagickCore/cache.c b/ImageMagick-7.1.2-0/MagickCore/cache.c → ImageMagick-7.1.2-1/MagickCore/cache.c
@@ -1665,6 +1665,27 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
 %
 */
 
+static MagickBooleanType GetDynamicThrottlePolicy(void)
+{
+  static MagickBooleanType
+    check_policy = MagickTrue;
+
+  static MagickBooleanType
+    dynamic_throttle = MagickFalse;
+
+  if (check_policy != MagickFalse)
+    {
+      char *value = GetPolicyValue("resource:dynamic-throttle");
+      if (value != (char *) NULL)
+        {
+          dynamic_throttle=IsStringTrue(value);
+          value=DestroyString(value);
+        }
+    check_policy=MagickFalse;
+  }
+  return(dynamic_throttle);
+}
+
 static inline MagickBooleanType ValidatePixelCacheMorphology(
   const Image *magick_restrict image)
 {
@@ -1720,8 +1741,29 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
     }
   if (cpu_throttle == MagickResourceInfinity)
     cpu_throttle=GetMagickResourceLimit(ThrottleResource);
-  if ((cpu_throttle != 0) && ((cycles++ % 4096) == 0))
+  if ((GetDynamicThrottlePolicy() != MagickFalse) && ((cycles % 65536) == 0))
+    {
+      const double
+        max_delay = 50.0,
+        sensitivity = 0.3;
+
+      double
+        load,
+        load_average = 0.0;
+
+      /*
+        Dynamically throttle the CPU relative to the load average.
+      */
+#if defined(MAGICKCORE_HAVE_GETLOADAVG)
+      if (getloadavg(&load_average,1) != 1)
+        load_average=0.0;
+#endif
+      load=MagickMax(load_average-GetOpenMPMaximumThreads(),0.0);
+      cpu_throttle=(MagickSizeType) (max_delay*(1.0-exp(-sensitivity*load)));
+    }
+  if ((cpu_throttle != 0) && ((cycles % 4096) == 0))
     MagickDelay(cpu_throttle);
+  cycles++;
   LockSemaphoreInfo(image->semaphore);
   assert(image->cache != (Cache) NULL);
   cache_info=(CacheInfo *) image->cache;

diff --git a/ImageMagick-7.1.2-0/MagickCore/cache.h → ImageMagick-7.1.2-1/MagickCore/cache.h b/ImageMagick-7.1.2-0/MagickCore/cache.h → ImageMagick-7.1.2-1/MagickCore/cache.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/channel.c → ImageMagick-7.1.2-1/MagickCore/channel.c b/ImageMagick-7.1.2-0/MagickCore/channel.c → ImageMagick-7.1.2-1/MagickCore/channel.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/channel.h → ImageMagick-7.1.2-1/MagickCore/channel.h b/ImageMagick-7.1.2-0/MagickCore/channel.h → ImageMagick-7.1.2-1/MagickCore/channel.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cipher.c → ImageMagick-7.1.2-1/MagickCore/cipher.c b/ImageMagick-7.1.2-0/MagickCore/cipher.c → ImageMagick-7.1.2-1/MagickCore/cipher.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/cipher.h → ImageMagick-7.1.2-1/MagickCore/cipher.h b/ImageMagick-7.1.2-0/MagickCore/cipher.h → ImageMagick-7.1.2-1/MagickCore/cipher.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/client.c → ImageMagick-7.1.2-1/MagickCore/client.c b/ImageMagick-7.1.2-0/MagickCore/client.c → ImageMagick-7.1.2-1/MagickCore/client.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/client.h → ImageMagick-7.1.2-1/MagickCore/client.h b/ImageMagick-7.1.2-0/MagickCore/client.h → ImageMagick-7.1.2-1/MagickCore/client.h
diff --git a/...Magick-7.1.2-0/MagickCore/coder-private.h → ...Magick-7.1.2-1/MagickCore/coder-private.h b/...Magick-7.1.2-0/MagickCore/coder-private.h → ...Magick-7.1.2-1/MagickCore/coder-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/coder.c → ImageMagick-7.1.2-1/MagickCore/coder.c b/ImageMagick-7.1.2-0/MagickCore/coder.c → ImageMagick-7.1.2-1/MagickCore/coder.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/coder.h → ImageMagick-7.1.2-1/MagickCore/coder.h b/ImageMagick-7.1.2-0/MagickCore/coder.h → ImageMagick-7.1.2-1/MagickCore/coder.h
diff --git a/...Magick-7.1.2-0/MagickCore/color-private.h → ...Magick-7.1.2-1/MagickCore/color-private.h b/...Magick-7.1.2-0/MagickCore/color-private.h → ...Magick-7.1.2-1/MagickCore/color-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/color.c → ImageMagick-7.1.2-1/MagickCore/color.c b/ImageMagick-7.1.2-0/MagickCore/color.c → ImageMagick-7.1.2-1/MagickCore/color.c
@@ -1685,7 +1685,7 @@ MagickPrivate MagickBooleanType IsEquivalentAlpha(const Image *image,
     return(MagickTrue);
   fuzz=p->fuzz*p->fuzz+q->fuzz*q->fuzz;
   pixel=(double) p->alpha-(double) q->alpha;
-  if ((pixel*pixel) > fuzz)
+  if (MagickSafeSignificantError(pixel*pixel,fuzz) != MagickFalse)
     return(MagickFalse);
   return(MagickTrue);
 }
@@ -1855,7 +1855,7 @@ MagickPrivate MagickBooleanType IsEquivalentIntensity(const Image *image,
     return(MagickTrue);
   fuzz=p->fuzz*p->fuzz+q->fuzz*q->fuzz;
   pixel=GetPixelInfoIntensity(image,p)-GetPixelInfoIntensity(image,q);
-  if ((pixel*pixel) > fuzz)
+  if (MagickSafeSignificantError(pixel*pixel,fuzz) != MagickFalse)
     return(MagickFalse);
   return(MagickTrue);
 }

diff --git a/ImageMagick-7.1.2-0/MagickCore/color.h → ImageMagick-7.1.2-1/MagickCore/color.h b/ImageMagick-7.1.2-0/MagickCore/color.h → ImageMagick-7.1.2-1/MagickCore/color.h
diff --git a/...ick-7.1.2-0/MagickCore/colormap-private.h → ...ick-7.1.2-1/MagickCore/colormap-private.h b/...ick-7.1.2-0/MagickCore/colormap-private.h → ...ick-7.1.2-1/MagickCore/colormap-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colormap.c → ImageMagick-7.1.2-1/MagickCore/colormap.c b/ImageMagick-7.1.2-0/MagickCore/colormap.c → ImageMagick-7.1.2-1/MagickCore/colormap.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/colormap.h → ImageMagick-7.1.2-1/MagickCore/colormap.h b/ImageMagick-7.1.2-0/MagickCore/colormap.h → ImageMagick-7.1.2-1/MagickCore/colormap.h
diff --git a/...k-7.1.2-0/MagickCore/colorspace-private.h → ...k-7.1.2-1/MagickCore/colorspace-private.h b/...k-7.1.2-0/MagickCore/colorspace-private.h → ...k-7.1.2-1/MagickCore/colorspace-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colorspace.c → ImageMagick-7.1.2-1/MagickCore/colorspace.c b/ImageMagick-7.1.2-0/MagickCore/colorspace.c → ImageMagick-7.1.2-1/MagickCore/colorspace.c
@@ -70,6 +70,11 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/utility.h"
 
+/*
+  Define declarations.
+*/
+#define MaximumLogarithmicColorspace  1024.0
+
 /*
   Typedef declarations.
 */
@@ -1106,7 +1111,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       for (i=0; i <= (ssize_t) MaxMap; i++)
         logmap[i]=ScaleMapToQuantum(((double) MaxMap*(reference_white+
           log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002*
-          MagickSafeReciprocal(film_gamma)))/1024.0));
+          MagickSafeReciprocal(film_gamma)))/MaximumLogarithmicColorspace));
       image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
       #pragma omp parallel for schedule(static) shared(status) \
@@ -2420,23 +2425,29 @@ static MagickBooleanType TransformsRGBImage(Image *image,
       value=GetImageProperty(image,"reference-black",exception);
       if (value != (const char *) NULL)
         reference_black=StringToDouble(value,(char **) NULL);
+      if (reference_black > MaximumLogarithmicColorspace)
+        reference_black=MaximumLogarithmicColorspace;
       reference_white=ReferenceWhite;
       value=GetImageProperty(image,"reference-white",exception);
       if (value != (const char *) NULL)
         reference_white=StringToDouble(value,(char **) NULL);
+      if (reference_white > MaximumLogarithmicColorspace)
+        reference_white=MaximumLogarithmicColorspace;
+      if (reference_black > reference_white)
+        reference_black=reference_white;
       logmap=(Quantum *) AcquireQuantumMemory((size_t) MaxMap+1UL,
         sizeof(*logmap));
       if (logmap == (Quantum *) NULL)
         ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
           image->filename);
       black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002*
         MagickSafeReciprocal(film_gamma));
-      for (i=0; i <= (ssize_t) (reference_black*MaxMap/1024.0); i++)
+      for (i=0; i <= (ssize_t) (reference_black*MaxMap/MaximumLogarithmicColorspace); i++)
         logmap[i]=(Quantum) 0;
-      for ( ; i < (ssize_t) (reference_white*MaxMap/1024.0); i++)
+      for ( ; i < (ssize_t) (reference_white*MaxMap/MaximumLogarithmicColorspace); i++)
         logmap[i]=ClampToQuantum((double) QuantumRange/(1.0-black)*
-          (pow(10.0,(1024.0*i/MaxMap-reference_white)*(gamma/density)*0.002*
-          MagickSafeReciprocal(film_gamma))-black));
+          (pow(10.0,(MaximumLogarithmicColorspace*i/MaxMap-reference_white)*
+          (gamma/density)*0.002*MagickSafeReciprocal(film_gamma))-black));
       for ( ; i <= (ssize_t) MaxMap; i++)
         logmap[i]=QuantumRange;
       if (image->storage_class == PseudoClass)
@@ -2787,12 +2798,12 @@ static MagickBooleanType TransformsRGBImage(Image *image,
           pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
           if (image->colorspace == YCCColorspace)
             {
-              pixel.red=(double) QuantumRange*(double)
-                YCCMap[RoundToYCC(1024.0*pixel.red/(double) MaxMap)];
-              pixel.green=(double) QuantumRange*(double)
-                YCCMap[RoundToYCC(1024.0*pixel.green/(double) MaxMap)];
-              pixel.blue=(double) QuantumRange*(double)
-                YCCMap[RoundToYCC(1024.0*pixel.blue/(double) MaxMap)];
+              pixel.red=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+                MaximumLogarithmicColorspace*pixel.red/(double) MaxMap)];
+              pixel.green=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+                MaximumLogarithmicColorspace*pixel.green/(double) MaxMap)];
+              pixel.blue=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+                MaximumLogarithmicColorspace*pixel.blue/(double) MaxMap)];
             }
           else
             {
@@ -2853,12 +2864,12 @@ static MagickBooleanType TransformsRGBImage(Image *image,
         pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
         if (image->colorspace == YCCColorspace)
           {
-            pixel.red=(double) QuantumRange*(double) YCCMap[RoundToYCC(1024.0*
-              pixel.red/(double) MaxMap)];
-            pixel.green=(double) QuantumRange*(double) YCCMap[RoundToYCC(1024.0*
-              pixel.green/(double) MaxMap)];
-            pixel.blue=(double) QuantumRange*(double) YCCMap[RoundToYCC(1024.0*
-              pixel.blue/(double) MaxMap)];
+            pixel.red=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+              MaximumLogarithmicColorspace*pixel.red/(double) MaxMap)];
+            pixel.green=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+              MaximumLogarithmicColorspace*pixel.green/(double) MaxMap)];
+            pixel.blue=(double) QuantumRange*(double) YCCMap[RoundToYCC(
+              MaximumLogarithmicColorspace*pixel.blue/(double) MaxMap)];
           }
         else
           {

diff --git a/ImageMagick-7.1.2-0/MagickCore/colorspace.h → ImageMagick-7.1.2-1/MagickCore/colorspace.h b/ImageMagick-7.1.2-0/MagickCore/colorspace.h → ImageMagick-7.1.2-1/MagickCore/colorspace.h
diff --git a/...gick-7.1.2-0/MagickCore/compare-private.h → ...gick-7.1.2-1/MagickCore/compare-private.h b/...gick-7.1.2-0/MagickCore/compare-private.h → ...gick-7.1.2-1/MagickCore/compare-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/compare.c → ImageMagick-7.1.2-1/MagickCore/compare.c b/ImageMagick-7.1.2-0/MagickCore/compare.c → ImageMagick-7.1.2-1/MagickCore/compare.c
@@ -397,7 +397,7 @@ static MagickBooleanType GetAESimilarity(const Image *image,
             channel,q);
         else
           error=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
-        if ((error*error) > fuzz)
+        if (MagickSafeSignificantError(error*error,fuzz) != MagickFalse)
           {
             channel_similarity[i]++;
             count++;
@@ -724,7 +724,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
             channel,q);
         else
           error=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
-        if ((error*error) > fuzz)
+        if (MagickSafeSignificantError(error*error,fuzz) != MagickFalse)
           {
             channel_similarity[i]+=QuantumScale*error*QuantumScale*error;
             channel_similarity[CompositePixelChannel]+=QuantumScale*error*

diff --git a/ImageMagick-7.1.2-0/MagickCore/compare.h → ImageMagick-7.1.2-1/MagickCore/compare.h b/ImageMagick-7.1.2-0/MagickCore/compare.h → ImageMagick-7.1.2-1/MagickCore/compare.h
diff --git a/...ck-7.1.2-0/MagickCore/composite-private.h → ...ck-7.1.2-1/MagickCore/composite-private.h b/...ck-7.1.2-0/MagickCore/composite-private.h → ...ck-7.1.2-1/MagickCore/composite-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/composite.c → ImageMagick-7.1.2-1/MagickCore/composite.c b/ImageMagick-7.1.2-0/MagickCore/composite.c → ImageMagick-7.1.2-1/MagickCore/composite.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/composite.h → ImageMagick-7.1.2-1/MagickCore/composite.h b/ImageMagick-7.1.2-0/MagickCore/composite.h → ImageMagick-7.1.2-1/MagickCore/composite.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/compress.c → ImageMagick-7.1.2-1/MagickCore/compress.c b/ImageMagick-7.1.2-0/MagickCore/compress.c → ImageMagick-7.1.2-1/MagickCore/compress.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/compress.h → ImageMagick-7.1.2-1/MagickCore/compress.h b/ImageMagick-7.1.2-0/MagickCore/compress.h → ImageMagick-7.1.2-1/MagickCore/compress.h
diff --git a/...ck-7.1.2-0/MagickCore/configure-private.h → ...ck-7.1.2-1/MagickCore/configure-private.h b/...ck-7.1.2-0/MagickCore/configure-private.h → ...ck-7.1.2-1/MagickCore/configure-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/configure.c → ImageMagick-7.1.2-1/MagickCore/configure.c b/ImageMagick-7.1.2-0/MagickCore/configure.c → ImageMagick-7.1.2-1/MagickCore/configure.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/configure.h → ImageMagick-7.1.2-1/MagickCore/configure.h b/ImageMagick-7.1.2-0/MagickCore/configure.h → ImageMagick-7.1.2-1/MagickCore/configure.h
diff --git a/...k-7.1.2-0/MagickCore/constitute-private.h → ...k-7.1.2-1/MagickCore/constitute-private.h b/...k-7.1.2-0/MagickCore/constitute-private.h → ...k-7.1.2-1/MagickCore/constitute-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/constitute.c → ImageMagick-7.1.2-1/MagickCore/constitute.c b/ImageMagick-7.1.2-0/MagickCore/constitute.c → ImageMagick-7.1.2-1/MagickCore/constitute.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/constitute.h → ImageMagick-7.1.2-1/MagickCore/constitute.h b/ImageMagick-7.1.2-0/MagickCore/constitute.h → ImageMagick-7.1.2-1/MagickCore/constitute.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/decorate.c → ImageMagick-7.1.2-1/MagickCore/decorate.c b/ImageMagick-7.1.2-0/MagickCore/decorate.c → ImageMagick-7.1.2-1/MagickCore/decorate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/decorate.h → ImageMagick-7.1.2-1/MagickCore/decorate.h b/ImageMagick-7.1.2-0/MagickCore/decorate.h → ImageMagick-7.1.2-1/MagickCore/decorate.h
diff --git a/...ick-7.1.2-0/MagickCore/delegate-private.h → ...ick-7.1.2-1/MagickCore/delegate-private.h b/...ick-7.1.2-0/MagickCore/delegate-private.h → ...ick-7.1.2-1/MagickCore/delegate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/delegate.c → ImageMagick-7.1.2-1/MagickCore/delegate.c b/ImageMagick-7.1.2-0/MagickCore/delegate.c → ImageMagick-7.1.2-1/MagickCore/delegate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/delegate.h → ImageMagick-7.1.2-1/MagickCore/delegate.h b/ImageMagick-7.1.2-0/MagickCore/delegate.h → ImageMagick-7.1.2-1/MagickCore/delegate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/deprecate.c → ImageMagick-7.1.2-1/MagickCore/deprecate.c b/ImageMagick-7.1.2-0/MagickCore/deprecate.c → ImageMagick-7.1.2-1/MagickCore/deprecate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/deprecate.h → ImageMagick-7.1.2-1/MagickCore/deprecate.h b/ImageMagick-7.1.2-0/MagickCore/deprecate.h → ImageMagick-7.1.2-1/MagickCore/deprecate.h
diff --git a/...gick-7.1.2-0/MagickCore/display-private.h → ...gick-7.1.2-1/MagickCore/display-private.h b/...gick-7.1.2-0/MagickCore/display-private.h → ...gick-7.1.2-1/MagickCore/display-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/display.c → ImageMagick-7.1.2-1/MagickCore/display.c b/ImageMagick-7.1.2-0/MagickCore/display.c → ImageMagick-7.1.2-1/MagickCore/display.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/display.h → ImageMagick-7.1.2-1/MagickCore/display.h b/ImageMagick-7.1.2-0/MagickCore/display.h → ImageMagick-7.1.2-1/MagickCore/display.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/distort.c → ImageMagick-7.1.2-1/MagickCore/distort.c b/ImageMagick-7.1.2-0/MagickCore/distort.c → ImageMagick-7.1.2-1/MagickCore/distort.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/distort.h → ImageMagick-7.1.2-1/MagickCore/distort.h b/ImageMagick-7.1.2-0/MagickCore/distort.h → ImageMagick-7.1.2-1/MagickCore/distort.h
diff --git a/...2-0/MagickCore/distribute-cache-private.h → ...2-1/MagickCore/distribute-cache-private.h b/...2-0/MagickCore/distribute-cache-private.h → ...2-1/MagickCore/distribute-cache-private.h
diff --git a/...ick-7.1.2-0/MagickCore/distribute-cache.c → ...ick-7.1.2-1/MagickCore/distribute-cache.c b/...ick-7.1.2-0/MagickCore/distribute-cache.c → ...ick-7.1.2-1/MagickCore/distribute-cache.c
diff --git a/...ick-7.1.2-0/MagickCore/distribute-cache.h → ...ick-7.1.2-1/MagickCore/distribute-cache.h b/...ick-7.1.2-0/MagickCore/distribute-cache.h → ...ick-7.1.2-1/MagickCore/distribute-cache.h
diff --git a/...eMagick-7.1.2-0/MagickCore/draw-private.h → ...eMagick-7.1.2-1/MagickCore/draw-private.h b/...eMagick-7.1.2-0/MagickCore/draw-private.h → ...eMagick-7.1.2-1/MagickCore/draw-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/draw.c → ImageMagick-7.1.2-1/MagickCore/draw.c b/ImageMagick-7.1.2-0/MagickCore/draw.c → ImageMagick-7.1.2-1/MagickCore/draw.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/draw.h → ImageMagick-7.1.2-1/MagickCore/draw.h b/ImageMagick-7.1.2-0/MagickCore/draw.h → ImageMagick-7.1.2-1/MagickCore/draw.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/effect.c → ImageMagick-7.1.2-1/MagickCore/effect.c b/ImageMagick-7.1.2-0/MagickCore/effect.c → ImageMagick-7.1.2-1/MagickCore/effect.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/effect.h → ImageMagick-7.1.2-1/MagickCore/effect.h b/ImageMagick-7.1.2-0/MagickCore/effect.h → ImageMagick-7.1.2-1/MagickCore/effect.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/enhance.c → ImageMagick-7.1.2-1/MagickCore/enhance.c b/ImageMagick-7.1.2-0/MagickCore/enhance.c → ImageMagick-7.1.2-1/MagickCore/enhance.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/enhance.h → ImageMagick-7.1.2-1/MagickCore/enhance.h b/ImageMagick-7.1.2-0/MagickCore/enhance.h → ImageMagick-7.1.2-1/MagickCore/enhance.h
diff --git a/...ck-7.1.2-0/MagickCore/exception-private.h → ...ck-7.1.2-1/MagickCore/exception-private.h b/...ck-7.1.2-0/MagickCore/exception-private.h → ...ck-7.1.2-1/MagickCore/exception-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/exception.c → ImageMagick-7.1.2-1/MagickCore/exception.c b/ImageMagick-7.1.2-0/MagickCore/exception.c → ImageMagick-7.1.2-1/MagickCore/exception.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/exception.h → ImageMagick-7.1.2-1/MagickCore/exception.h b/ImageMagick-7.1.2-0/MagickCore/exception.h → ImageMagick-7.1.2-1/MagickCore/exception.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/feature.c → ImageMagick-7.1.2-1/MagickCore/feature.c b/ImageMagick-7.1.2-0/MagickCore/feature.c → ImageMagick-7.1.2-1/MagickCore/feature.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/feature.h → ImageMagick-7.1.2-1/MagickCore/feature.h b/ImageMagick-7.1.2-0/MagickCore/feature.h → ImageMagick-7.1.2-1/MagickCore/feature.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fourier.c → ImageMagick-7.1.2-1/MagickCore/fourier.c b/ImageMagick-7.1.2-0/MagickCore/fourier.c → ImageMagick-7.1.2-1/MagickCore/fourier.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/fourier.h → ImageMagick-7.1.2-1/MagickCore/fourier.h b/ImageMagick-7.1.2-0/MagickCore/fourier.h → ImageMagick-7.1.2-1/MagickCore/fourier.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx-private.h → ImageMagick-7.1.2-1/MagickCore/fx-private.h b/ImageMagick-7.1.2-0/MagickCore/fx-private.h → ImageMagick-7.1.2-1/MagickCore/fx-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx.c → ImageMagick-7.1.2-1/MagickCore/fx.c b/ImageMagick-7.1.2-0/MagickCore/fx.c → ImageMagick-7.1.2-1/MagickCore/fx.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx.h → ImageMagick-7.1.2-1/MagickCore/fx.h b/ImageMagick-7.1.2-0/MagickCore/fx.h → ImageMagick-7.1.2-1/MagickCore/fx.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem-private.h → ImageMagick-7.1.2-1/MagickCore/gem-private.h b/ImageMagick-7.1.2-0/MagickCore/gem-private.h → ImageMagick-7.1.2-1/MagickCore/gem-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem.c → ImageMagick-7.1.2-1/MagickCore/gem.c b/ImageMagick-7.1.2-0/MagickCore/gem.c → ImageMagick-7.1.2-1/MagickCore/gem.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem.h → ImageMagick-7.1.2-1/MagickCore/gem.h b/ImageMagick-7.1.2-0/MagickCore/gem.h → ImageMagick-7.1.2-1/MagickCore/gem.h
diff --git a/...ick-7.1.2-0/MagickCore/geometry-private.h → ...ick-7.1.2-1/MagickCore/geometry-private.h b/...ick-7.1.2-0/MagickCore/geometry-private.h → ...ick-7.1.2-1/MagickCore/geometry-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/geometry.c → ImageMagick-7.1.2-1/MagickCore/geometry.c b/ImageMagick-7.1.2-0/MagickCore/geometry.c → ImageMagick-7.1.2-1/MagickCore/geometry.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/geometry.h → ImageMagick-7.1.2-1/MagickCore/geometry.h b/ImageMagick-7.1.2-0/MagickCore/geometry.h → ImageMagick-7.1.2-1/MagickCore/geometry.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/histogram.c → ImageMagick-7.1.2-1/MagickCore/histogram.c b/ImageMagick-7.1.2-0/MagickCore/histogram.c → ImageMagick-7.1.2-1/MagickCore/histogram.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/histogram.h → ImageMagick-7.1.2-1/MagickCore/histogram.h b/ImageMagick-7.1.2-0/MagickCore/histogram.h → ImageMagick-7.1.2-1/MagickCore/histogram.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/identify.c → ImageMagick-7.1.2-1/MagickCore/identify.c b/ImageMagick-7.1.2-0/MagickCore/identify.c → ImageMagick-7.1.2-1/MagickCore/identify.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/identify.h → ImageMagick-7.1.2-1/MagickCore/identify.h b/ImageMagick-7.1.2-0/MagickCore/identify.h → ImageMagick-7.1.2-1/MagickCore/identify.h
diff --git a/...Magick-7.1.2-0/MagickCore/image-private.h → ...Magick-7.1.2-1/MagickCore/image-private.h b/...Magick-7.1.2-0/MagickCore/image-private.h → ...Magick-7.1.2-1/MagickCore/image-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/image-view.c → ImageMagick-7.1.2-1/MagickCore/image-view.c b/ImageMagick-7.1.2-0/MagickCore/image-view.c → ImageMagick-7.1.2-1/MagickCore/image-view.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/image-view.h → ImageMagick-7.1.2-1/MagickCore/image-view.h b/ImageMagick-7.1.2-0/MagickCore/image-view.h → ImageMagick-7.1.2-1/MagickCore/image-view.h