diff --git a/Android.mk b/Android.mk
index 59f08d921..dbab38ba1 100644
--- 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 b/ImageMagick-7.1.2-1/Magick++/lib/Blob.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Blob.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Blob.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/BlobRef.cpp b/ImageMagick-7.1.2-1/Magick++/lib/BlobRef.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/BlobRef.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/BlobRef.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/CoderInfo.cpp b/ImageMagick-7.1.2-1/Magick++/lib/CoderInfo.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/CoderInfo.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/CoderInfo.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Color.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Color.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Color.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Color.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Drawable.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Drawable.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Drawable.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Drawable.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Exception.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Exception.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Exception.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Exception.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Functions.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Functions.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Functions.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Functions.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Geometry.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Geometry.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Geometry.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Geometry.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Image.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Image.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Image.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Image.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/ImageRef.cpp b/ImageMagick-7.1.2-1/Magick++/lib/ImageRef.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/ImageRef.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/ImageRef.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Blob.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Blob.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Blob.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Blob.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/BlobRef.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/BlobRef.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/BlobRef.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/BlobRef.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/CoderInfo.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/CoderInfo.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/CoderInfo.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/CoderInfo.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Color.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Color.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Color.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Color.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Drawable.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Drawable.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Drawable.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Drawable.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Exception.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Exception.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Exception.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Exception.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Functions.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Functions.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Functions.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Functions.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Geometry.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Geometry.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Geometry.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Geometry.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Image.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Image.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Image.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Image.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/ImageRef.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/ImageRef.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/ImageRef.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/ImageRef.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Include.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Include.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Include.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Include.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Montage.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Montage.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Montage.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Montage.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Options.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Options.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Options.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Options.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Pixels.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Pixels.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Pixels.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Pixels.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/ResourceLimits.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/ResourceLimits.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/ResourceLimits.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/ResourceLimits.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/STL.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/STL.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/STL.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/STL.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/SecurityPolicy.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/SecurityPolicy.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/SecurityPolicy.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/SecurityPolicy.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Statistic.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Statistic.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Statistic.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Statistic.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/Thread.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/Thread.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/Thread.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/Thread.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Magick++/TypeMetric.h b/ImageMagick-7.1.2-1/Magick++/lib/Magick++/TypeMetric.h
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Magick++/TypeMetric.h
rename to ImageMagick-7.1.2-1/Magick++/lib/Magick++/TypeMetric.h
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Montage.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Montage.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Montage.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Montage.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Options.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Options.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Options.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Options.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Pixels.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Pixels.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Pixels.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/ResourceLimits.cpp b/ImageMagick-7.1.2-1/Magick++/lib/ResourceLimits.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/ResourceLimits.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/ResourceLimits.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/STL.cpp b/ImageMagick-7.1.2-1/Magick++/lib/STL.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/STL.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/STL.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/SecurityPolicy.cpp b/ImageMagick-7.1.2-1/Magick++/lib/SecurityPolicy.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/SecurityPolicy.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/SecurityPolicy.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Statistic.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Statistic.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Statistic.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Statistic.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/Thread.cpp b/ImageMagick-7.1.2-1/Magick++/lib/Thread.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/Thread.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/Thread.cpp
diff --git a/ImageMagick-7.1.2-0/Magick++/lib/TypeMetric.cpp b/ImageMagick-7.1.2-1/Magick++/lib/TypeMetric.cpp
similarity index 100%
rename from ImageMagick-7.1.2-0/Magick++/lib/TypeMetric.cpp
rename to ImageMagick-7.1.2-1/Magick++/lib/TypeMetric.cpp
diff --git a/ImageMagick-7.1.2-0/MagickCore/MagickCore.h b/ImageMagick-7.1.2-1/MagickCore/MagickCore.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/MagickCore.h
rename to ImageMagick-7.1.2-1/MagickCore/MagickCore.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/accelerate-kernels-private.h b/ImageMagick-7.1.2-1/MagickCore/accelerate-kernels-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/accelerate-kernels-private.h
rename to ImageMagick-7.1.2-1/MagickCore/accelerate-kernels-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/accelerate-private.h b/ImageMagick-7.1.2-1/MagickCore/accelerate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/accelerate-private.h
rename to ImageMagick-7.1.2-1/MagickCore/accelerate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/accelerate.c b/ImageMagick-7.1.2-1/MagickCore/accelerate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/accelerate.c
rename to ImageMagick-7.1.2-1/MagickCore/accelerate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/animate-private.h b/ImageMagick-7.1.2-1/MagickCore/animate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/animate-private.h
rename to ImageMagick-7.1.2-1/MagickCore/animate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/animate.c b/ImageMagick-7.1.2-1/MagickCore/animate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/animate.c
rename to ImageMagick-7.1.2-1/MagickCore/animate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/animate.h b/ImageMagick-7.1.2-1/MagickCore/animate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/animate.h
rename to ImageMagick-7.1.2-1/MagickCore/animate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/annotate-private.h b/ImageMagick-7.1.2-1/MagickCore/annotate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/annotate-private.h
rename to ImageMagick-7.1.2-1/MagickCore/annotate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/annotate.c b/ImageMagick-7.1.2-1/MagickCore/annotate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/annotate.c
rename to ImageMagick-7.1.2-1/MagickCore/annotate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/annotate.h b/ImageMagick-7.1.2-1/MagickCore/annotate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/annotate.h
rename to ImageMagick-7.1.2-1/MagickCore/annotate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/artifact.c b/ImageMagick-7.1.2-1/MagickCore/artifact.c
similarity index 98%
rename from ImageMagick-7.1.2-0/MagickCore/artifact.c
rename to ImageMagick-7.1.2-1/MagickCore/artifact.c
index dae6aaaf0..764ef75a4 100644
--- a/ImageMagick-7.1.2-0/MagickCore/artifact.c
+++ b/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 b/ImageMagick-7.1.2-1/MagickCore/artifact.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/artifact.h
rename to ImageMagick-7.1.2-1/MagickCore/artifact.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/attribute.c b/ImageMagick-7.1.2-1/MagickCore/attribute.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/attribute.c
rename to ImageMagick-7.1.2-1/MagickCore/attribute.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/attribute.h b/ImageMagick-7.1.2-1/MagickCore/attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/attribute.h
rename to ImageMagick-7.1.2-1/MagickCore/attribute.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/blob-private.h b/ImageMagick-7.1.2-1/MagickCore/blob-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/blob-private.h
rename to ImageMagick-7.1.2-1/MagickCore/blob-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/blob.c b/ImageMagick-7.1.2-1/MagickCore/blob.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/blob.c
rename to ImageMagick-7.1.2-1/MagickCore/blob.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/blob.h b/ImageMagick-7.1.2-1/MagickCore/blob.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/blob.h
rename to ImageMagick-7.1.2-1/MagickCore/blob.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache-private.h b/ImageMagick-7.1.2-1/MagickCore/cache-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cache-private.h
rename to ImageMagick-7.1.2-1/MagickCore/cache-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache-view.c b/ImageMagick-7.1.2-1/MagickCore/cache-view.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cache-view.c
rename to ImageMagick-7.1.2-1/MagickCore/cache-view.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache-view.h b/ImageMagick-7.1.2-1/MagickCore/cache-view.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cache-view.h
rename to ImageMagick-7.1.2-1/MagickCore/cache-view.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cache.c b/ImageMagick-7.1.2-1/MagickCore/cache.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/cache.c
rename to ImageMagick-7.1.2-1/MagickCore/cache.c
index c12abd02a..380fe1a3c 100644
--- a/ImageMagick-7.1.2-0/MagickCore/cache.c
+++ b/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 b/ImageMagick-7.1.2-1/MagickCore/cache.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cache.h
rename to ImageMagick-7.1.2-1/MagickCore/cache.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/channel.c b/ImageMagick-7.1.2-1/MagickCore/channel.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/channel.c
rename to ImageMagick-7.1.2-1/MagickCore/channel.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/channel.h b/ImageMagick-7.1.2-1/MagickCore/channel.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/channel.h
rename to ImageMagick-7.1.2-1/MagickCore/channel.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/cipher.c b/ImageMagick-7.1.2-1/MagickCore/cipher.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cipher.c
rename to ImageMagick-7.1.2-1/MagickCore/cipher.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/cipher.h b/ImageMagick-7.1.2-1/MagickCore/cipher.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/cipher.h
rename to ImageMagick-7.1.2-1/MagickCore/cipher.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/client.c b/ImageMagick-7.1.2-1/MagickCore/client.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/client.c
rename to ImageMagick-7.1.2-1/MagickCore/client.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/client.h b/ImageMagick-7.1.2-1/MagickCore/client.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/client.h
rename to ImageMagick-7.1.2-1/MagickCore/client.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/coder-private.h b/ImageMagick-7.1.2-1/MagickCore/coder-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/coder-private.h
rename to ImageMagick-7.1.2-1/MagickCore/coder-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/coder.c b/ImageMagick-7.1.2-1/MagickCore/coder.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/coder.c
rename to ImageMagick-7.1.2-1/MagickCore/coder.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/coder.h b/ImageMagick-7.1.2-1/MagickCore/coder.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/coder.h
rename to ImageMagick-7.1.2-1/MagickCore/coder.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/color-private.h b/ImageMagick-7.1.2-1/MagickCore/color-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/color-private.h
rename to ImageMagick-7.1.2-1/MagickCore/color-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/color.c b/ImageMagick-7.1.2-1/MagickCore/color.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/color.c
rename to ImageMagick-7.1.2-1/MagickCore/color.c
index 599eefbfb..f53c6a8fd 100644
--- a/ImageMagick-7.1.2-0/MagickCore/color.c
+++ b/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 b/ImageMagick-7.1.2-1/MagickCore/color.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/color.h
rename to ImageMagick-7.1.2-1/MagickCore/color.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colormap-private.h b/ImageMagick-7.1.2-1/MagickCore/colormap-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/colormap-private.h
rename to ImageMagick-7.1.2-1/MagickCore/colormap-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colormap.c b/ImageMagick-7.1.2-1/MagickCore/colormap.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/colormap.c
rename to ImageMagick-7.1.2-1/MagickCore/colormap.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/colormap.h b/ImageMagick-7.1.2-1/MagickCore/colormap.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/colormap.h
rename to ImageMagick-7.1.2-1/MagickCore/colormap.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colorspace-private.h b/ImageMagick-7.1.2-1/MagickCore/colorspace-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/colorspace-private.h
rename to ImageMagick-7.1.2-1/MagickCore/colorspace-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/colorspace.c b/ImageMagick-7.1.2-1/MagickCore/colorspace.c
similarity index 98%
rename from ImageMagick-7.1.2-0/MagickCore/colorspace.c
rename to ImageMagick-7.1.2-1/MagickCore/colorspace.c
index 7ac78a683..eafcd0e68 100644
--- a/ImageMagick-7.1.2-0/MagickCore/colorspace.c
+++ b/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,10 +2425,16 @@ 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)
@@ -2431,12 +2442,12 @@ static MagickBooleanType TransformsRGBImage(Image *image,
           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 b/ImageMagick-7.1.2-1/MagickCore/colorspace.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/colorspace.h
rename to ImageMagick-7.1.2-1/MagickCore/colorspace.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/compare-private.h b/ImageMagick-7.1.2-1/MagickCore/compare-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/compare-private.h
rename to ImageMagick-7.1.2-1/MagickCore/compare-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/compare.c b/ImageMagick-7.1.2-1/MagickCore/compare.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/compare.c
rename to ImageMagick-7.1.2-1/MagickCore/compare.c
index 77f578a91..8fcf211bd 100644
--- a/ImageMagick-7.1.2-0/MagickCore/compare.c
+++ b/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 b/ImageMagick-7.1.2-1/MagickCore/compare.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/compare.h
rename to ImageMagick-7.1.2-1/MagickCore/compare.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/composite-private.h b/ImageMagick-7.1.2-1/MagickCore/composite-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/composite-private.h
rename to ImageMagick-7.1.2-1/MagickCore/composite-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/composite.c b/ImageMagick-7.1.2-1/MagickCore/composite.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/composite.c
rename to ImageMagick-7.1.2-1/MagickCore/composite.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/composite.h b/ImageMagick-7.1.2-1/MagickCore/composite.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/composite.h
rename to ImageMagick-7.1.2-1/MagickCore/composite.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/compress.c b/ImageMagick-7.1.2-1/MagickCore/compress.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/compress.c
rename to ImageMagick-7.1.2-1/MagickCore/compress.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/compress.h b/ImageMagick-7.1.2-1/MagickCore/compress.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/compress.h
rename to ImageMagick-7.1.2-1/MagickCore/compress.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/configure-private.h b/ImageMagick-7.1.2-1/MagickCore/configure-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/configure-private.h
rename to ImageMagick-7.1.2-1/MagickCore/configure-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/configure.c b/ImageMagick-7.1.2-1/MagickCore/configure.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/configure.c
rename to ImageMagick-7.1.2-1/MagickCore/configure.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/configure.h b/ImageMagick-7.1.2-1/MagickCore/configure.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/configure.h
rename to ImageMagick-7.1.2-1/MagickCore/configure.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/constitute-private.h b/ImageMagick-7.1.2-1/MagickCore/constitute-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/constitute-private.h
rename to ImageMagick-7.1.2-1/MagickCore/constitute-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/constitute.c b/ImageMagick-7.1.2-1/MagickCore/constitute.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/constitute.c
rename to ImageMagick-7.1.2-1/MagickCore/constitute.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/constitute.h b/ImageMagick-7.1.2-1/MagickCore/constitute.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/constitute.h
rename to ImageMagick-7.1.2-1/MagickCore/constitute.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/decorate.c b/ImageMagick-7.1.2-1/MagickCore/decorate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/decorate.c
rename to ImageMagick-7.1.2-1/MagickCore/decorate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/decorate.h b/ImageMagick-7.1.2-1/MagickCore/decorate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/decorate.h
rename to ImageMagick-7.1.2-1/MagickCore/decorate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/delegate-private.h b/ImageMagick-7.1.2-1/MagickCore/delegate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/delegate-private.h
rename to ImageMagick-7.1.2-1/MagickCore/delegate-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/delegate.c b/ImageMagick-7.1.2-1/MagickCore/delegate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/delegate.c
rename to ImageMagick-7.1.2-1/MagickCore/delegate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/delegate.h b/ImageMagick-7.1.2-1/MagickCore/delegate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/delegate.h
rename to ImageMagick-7.1.2-1/MagickCore/delegate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/deprecate.c b/ImageMagick-7.1.2-1/MagickCore/deprecate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/deprecate.c
rename to ImageMagick-7.1.2-1/MagickCore/deprecate.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/deprecate.h b/ImageMagick-7.1.2-1/MagickCore/deprecate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/deprecate.h
rename to ImageMagick-7.1.2-1/MagickCore/deprecate.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/display-private.h b/ImageMagick-7.1.2-1/MagickCore/display-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/display-private.h
rename to ImageMagick-7.1.2-1/MagickCore/display-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/display.c b/ImageMagick-7.1.2-1/MagickCore/display.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/display.c
rename to ImageMagick-7.1.2-1/MagickCore/display.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/display.h b/ImageMagick-7.1.2-1/MagickCore/display.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/display.h
rename to ImageMagick-7.1.2-1/MagickCore/display.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/distort.c b/ImageMagick-7.1.2-1/MagickCore/distort.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/distort.c
rename to ImageMagick-7.1.2-1/MagickCore/distort.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/distort.h b/ImageMagick-7.1.2-1/MagickCore/distort.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/distort.h
rename to ImageMagick-7.1.2-1/MagickCore/distort.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/distribute-cache-private.h b/ImageMagick-7.1.2-1/MagickCore/distribute-cache-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/distribute-cache-private.h
rename to ImageMagick-7.1.2-1/MagickCore/distribute-cache-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/distribute-cache.c b/ImageMagick-7.1.2-1/MagickCore/distribute-cache.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/distribute-cache.c
rename to ImageMagick-7.1.2-1/MagickCore/distribute-cache.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/distribute-cache.h b/ImageMagick-7.1.2-1/MagickCore/distribute-cache.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/distribute-cache.h
rename to ImageMagick-7.1.2-1/MagickCore/distribute-cache.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/draw-private.h b/ImageMagick-7.1.2-1/MagickCore/draw-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/draw-private.h
rename to ImageMagick-7.1.2-1/MagickCore/draw-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/draw.c b/ImageMagick-7.1.2-1/MagickCore/draw.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/draw.c
rename to ImageMagick-7.1.2-1/MagickCore/draw.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/draw.h b/ImageMagick-7.1.2-1/MagickCore/draw.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/draw.h
rename to ImageMagick-7.1.2-1/MagickCore/draw.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/effect.c b/ImageMagick-7.1.2-1/MagickCore/effect.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/effect.c
rename to ImageMagick-7.1.2-1/MagickCore/effect.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/effect.h b/ImageMagick-7.1.2-1/MagickCore/effect.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/effect.h
rename to ImageMagick-7.1.2-1/MagickCore/effect.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/enhance.c b/ImageMagick-7.1.2-1/MagickCore/enhance.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/enhance.c
rename to ImageMagick-7.1.2-1/MagickCore/enhance.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/enhance.h b/ImageMagick-7.1.2-1/MagickCore/enhance.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/enhance.h
rename to ImageMagick-7.1.2-1/MagickCore/enhance.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/exception-private.h b/ImageMagick-7.1.2-1/MagickCore/exception-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/exception-private.h
rename to ImageMagick-7.1.2-1/MagickCore/exception-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/exception.c b/ImageMagick-7.1.2-1/MagickCore/exception.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/exception.c
rename to ImageMagick-7.1.2-1/MagickCore/exception.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/exception.h b/ImageMagick-7.1.2-1/MagickCore/exception.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/exception.h
rename to ImageMagick-7.1.2-1/MagickCore/exception.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/feature.c b/ImageMagick-7.1.2-1/MagickCore/feature.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/feature.c
rename to ImageMagick-7.1.2-1/MagickCore/feature.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/feature.h b/ImageMagick-7.1.2-1/MagickCore/feature.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/feature.h
rename to ImageMagick-7.1.2-1/MagickCore/feature.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fourier.c b/ImageMagick-7.1.2-1/MagickCore/fourier.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/fourier.c
rename to ImageMagick-7.1.2-1/MagickCore/fourier.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/fourier.h b/ImageMagick-7.1.2-1/MagickCore/fourier.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/fourier.h
rename to ImageMagick-7.1.2-1/MagickCore/fourier.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx-private.h b/ImageMagick-7.1.2-1/MagickCore/fx-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/fx-private.h
rename to ImageMagick-7.1.2-1/MagickCore/fx-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx.c b/ImageMagick-7.1.2-1/MagickCore/fx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/fx.c
rename to ImageMagick-7.1.2-1/MagickCore/fx.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/fx.h b/ImageMagick-7.1.2-1/MagickCore/fx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/fx.h
rename to ImageMagick-7.1.2-1/MagickCore/fx.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem-private.h b/ImageMagick-7.1.2-1/MagickCore/gem-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/gem-private.h
rename to ImageMagick-7.1.2-1/MagickCore/gem-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem.c b/ImageMagick-7.1.2-1/MagickCore/gem.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/gem.c
rename to ImageMagick-7.1.2-1/MagickCore/gem.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/gem.h b/ImageMagick-7.1.2-1/MagickCore/gem.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/gem.h
rename to ImageMagick-7.1.2-1/MagickCore/gem.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/geometry-private.h b/ImageMagick-7.1.2-1/MagickCore/geometry-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/geometry-private.h
rename to ImageMagick-7.1.2-1/MagickCore/geometry-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/geometry.c b/ImageMagick-7.1.2-1/MagickCore/geometry.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/geometry.c
rename to ImageMagick-7.1.2-1/MagickCore/geometry.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/geometry.h b/ImageMagick-7.1.2-1/MagickCore/geometry.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/geometry.h
rename to ImageMagick-7.1.2-1/MagickCore/geometry.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/histogram.c b/ImageMagick-7.1.2-1/MagickCore/histogram.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/histogram.c
rename to ImageMagick-7.1.2-1/MagickCore/histogram.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/histogram.h b/ImageMagick-7.1.2-1/MagickCore/histogram.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/histogram.h
rename to ImageMagick-7.1.2-1/MagickCore/histogram.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/identify.c b/ImageMagick-7.1.2-1/MagickCore/identify.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/identify.c
rename to ImageMagick-7.1.2-1/MagickCore/identify.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/identify.h b/ImageMagick-7.1.2-1/MagickCore/identify.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/identify.h
rename to ImageMagick-7.1.2-1/MagickCore/identify.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/image-private.h b/ImageMagick-7.1.2-1/MagickCore/image-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/image-private.h
rename to ImageMagick-7.1.2-1/MagickCore/image-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/image-view.c b/ImageMagick-7.1.2-1/MagickCore/image-view.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/image-view.c
rename to ImageMagick-7.1.2-1/MagickCore/image-view.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/image-view.h b/ImageMagick-7.1.2-1/MagickCore/image-view.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/image-view.h
rename to ImageMagick-7.1.2-1/MagickCore/image-view.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/image.c b/ImageMagick-7.1.2-1/MagickCore/image.c
similarity index 98%
rename from ImageMagick-7.1.2-0/MagickCore/image.c
rename to ImageMagick-7.1.2-1/MagickCore/image.c
index b646df170..a1283ed5f 100644
--- a/ImageMagick-7.1.2-0/MagickCore/image.c
+++ b/ImageMagick-7.1.2-1/MagickCore/image.c
@@ -1651,34 +1651,43 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
   ExceptionInfo *exception)
 {
   char
-    *q;
+    *p = filename,
+    pattern[MagickPathExtent];
 
   const char
-    *p;
-
-  int
-    c;
-
-  MagickBooleanType
-    canonical;
-
-  ssize_t
-    offset;
+    *cursor = format;
 
-  canonical=MagickFalse;
-  offset=0;
+  /*
+    Start with a copy of the format string.
+  */
+  assert(format != (const char *) NULL);
+  assert(filename != (char *) NULL);
   (void) CopyMagickString(filename,format,MagickPathExtent);
   if (IsStringTrue(GetImageOption(image_info,"filename:literal")) != MagickFalse)
     return(strlen(filename));
-  for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%'))
+  while ((cursor=strchr(cursor,'%')) != (const char *) NULL)
   {
-    q=(char *) p+1;
-    if (*q == '%')
+    const char
+      *q = cursor;
+
+    ssize_t
+      offset = (ssize_t) (cursor-format);
+
+    cursor++;  /* move past '%' */
+    if (*cursor == '%')
       {
-        p++;
+        /*
+          Escaped %%.
+        */
+        cursor++;
         continue;
       }
-    switch (*q)
+    /*
+      Skip padding digits like %03d.
+    */
+    if (isdigit((int) ((unsigned char) *cursor)) != 0)
+      (void) strtol(cursor,(char **) &cursor,10);
+    switch (*cursor)
     {
       case 'd':
       case 'o':
@@ -1687,93 +1696,71 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
         ssize_t
           count;
 
-        q++;
-        c=(*q);
-        *q='\0';
-        count=FormatLocaleString(filename+(p-format-offset),(size_t)
-          (MagickPathExtent-(p-format-offset)),p,value);
-        if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset))))
+        count=FormatLocaleString(pattern,sizeof(pattern),q,value);
+        if ((count <= 0) || (count >= MagickPathExtent) ||
+            ((offset+count) >= MagickPathExtent))
           return(0);
-        offset+=(ssize_t) ((q-p)-count);
-        *q=(char) c;
-        (void) ConcatenateMagickString(filename,q,MagickPathExtent);
-        canonical=MagickTrue;
-        if (*(q-1) != '%')
-          break;
-        p++;
+        (void) CopyMagickString(p+offset,pattern,(size_t) (MagickPathExtent-
+          offset));
+        cursor++;
         break;
       }
       case '[':
       {
-        char
-          pattern[MagickPathExtent];
-
         const char
-          *option;
+          *end = strchr(cursor,']'),
+          *option = (const char *) NULL;
 
-        char
-          *r;
-
-        ssize_t
-          i;
-
-        ssize_t
-          depth;
+        size_t
+          extent = (size_t) (end-cursor-1),
+          option_length,
+          tail_length;
 
         /*
-          Image option.
+          Handle %[key:value];
         */
-        if (strchr(p,']') == (char *) NULL)
+        if (end == (const char *) NULL)
           break;
-        depth=1;
-        r=q+1;
-        for (i=0; (i < (MagickPathExtent-1L)) && (*r != '\0'); i++)
-        {
-          if (*r == '[')
-            depth++;
-          if (*r == ']')
-            depth--;
-          if (depth <= 0)
-            break;
-          pattern[i]=(*r++);
-        }
-        pattern[i]='\0';
-        if (LocaleNCompare(pattern,"filename:",9) != 0)
+        if (extent >= sizeof(pattern))
           break;
-        option=(const char *) NULL;
+        (void) CopyMagickString(pattern,cursor+1,extent+1);
+        pattern[extent]='\0';
         if (image != (Image *) NULL)
-          option=GetImageProperty(image,pattern,exception);
-        if ((option == (const char *) NULL) && (image != (Image *) NULL))
-          option=GetImageArtifact(image,pattern);
-        if ((option == (const char *) NULL) &&
+          {
+            option=GetImageProperty(image,pattern,exception);
+            if (option == (const char *) NULL)
+              option=GetImageArtifact(image,pattern);
+          }
+        if ((option == (const char *) NULL) && 
             (image_info != (ImageInfo *) NULL))
           option=GetImageOption(image_info,pattern);
         if (option == (const char *) NULL)
           break;
-        q--;
-        c=(*q);
-        *q='\0';
-        (void) CopyMagickString(filename+(p-format-offset),option,(size_t)
-          (MagickPathExtent-(p-format-offset)));
-        offset+=(ssize_t) strlen(pattern)-(ssize_t) strlen(option)+3;
-        *q=(char) c;
-        (void) ConcatenateMagickString(filename,r+1,MagickPathExtent);
-        canonical=MagickTrue;
-        if (*(q-1) != '%')
-          break;
-        p++;
+        option_length=strlen(option);
+        tail_length=strlen(end+1);
+        if ((offset+option_length+tail_length+1) > MagickPathExtent)
+          return(0);
+        (void) CopyMagickString(p+offset,option,(size_t) (MagickPathExtent-
+          offset));
+        (void) ConcatenateMagickString(p+offset+option_length,end+1,(size_t) (
+          MagickPathExtent-offset-option_length-tail_length-1));
+        cursor=end+1;
         break;
       }
       default:
         break;
     }
   }
-  if (canonical == MagickFalse)
-    (void) CopyMagickString(filename,format,MagickPathExtent);
-  else
-    for (q=filename; *q != '\0'; q++)
-      if ((*q == '%') && (*(q+1) == '%'))
-        (void) CopyMagickString(q,q+1,(size_t) (MagickPathExtent-(q-filename)));
+  for (p=filename; *p != '\0'; )
+  {
+    /*
+      Replace "%%" with "%".
+    */
+    if ((*p == '%') && (*(p+1) == '%'))
+      (void) memmove(p,p+1,strlen(p+1)+1);  /* shift left */
+    else
+      p++;
+  }
   return(strlen(filename));
 }
 
diff --git a/ImageMagick-7.1.2-0/MagickCore/image.h b/ImageMagick-7.1.2-1/MagickCore/image.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/image.h
rename to ImageMagick-7.1.2-1/MagickCore/image.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/layer.c b/ImageMagick-7.1.2-1/MagickCore/layer.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/layer.c
rename to ImageMagick-7.1.2-1/MagickCore/layer.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/layer.h b/ImageMagick-7.1.2-1/MagickCore/layer.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/layer.h
rename to ImageMagick-7.1.2-1/MagickCore/layer.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/linked-list-private.h b/ImageMagick-7.1.2-1/MagickCore/linked-list-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/linked-list-private.h
rename to ImageMagick-7.1.2-1/MagickCore/linked-list-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/linked-list.c b/ImageMagick-7.1.2-1/MagickCore/linked-list.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/linked-list.c
rename to ImageMagick-7.1.2-1/MagickCore/linked-list.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/linked-list.h b/ImageMagick-7.1.2-1/MagickCore/linked-list.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/linked-list.h
rename to ImageMagick-7.1.2-1/MagickCore/linked-list.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/list.c b/ImageMagick-7.1.2-1/MagickCore/list.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/list.c
rename to ImageMagick-7.1.2-1/MagickCore/list.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/list.h b/ImageMagick-7.1.2-1/MagickCore/list.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/list.h
rename to ImageMagick-7.1.2-1/MagickCore/list.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/locale-private.h b/ImageMagick-7.1.2-1/MagickCore/locale-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/locale-private.h
rename to ImageMagick-7.1.2-1/MagickCore/locale-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/locale.c b/ImageMagick-7.1.2-1/MagickCore/locale.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/locale.c
rename to ImageMagick-7.1.2-1/MagickCore/locale.c
index 572ca7305..5cf8054e5 100644
--- a/ImageMagick-7.1.2-0/MagickCore/locale.c
+++ b/ImageMagick-7.1.2-1/MagickCore/locale.c
@@ -1011,9 +1011,9 @@ MagickExport double InterpretLocaleValue(const char *magick_restrict string,
         value=strtod(string,&q);
       else
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-      value=_strtod_l(string,&q,locale);
+        value=_strtod_l(string,&q,locale);
 #else
-      value=strtod_l(string,&q,locale);
+        value=strtod_l(string,&q,locale);
 #endif
 #else
       value=strtod(string,&q);
diff --git a/ImageMagick-7.1.2-0/MagickCore/locale_.h b/ImageMagick-7.1.2-1/MagickCore/locale_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/locale_.h
rename to ImageMagick-7.1.2-1/MagickCore/locale_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/log-private.h b/ImageMagick-7.1.2-1/MagickCore/log-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/log-private.h
rename to ImageMagick-7.1.2-1/MagickCore/log-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/log.c b/ImageMagick-7.1.2-1/MagickCore/log.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/log.c
rename to ImageMagick-7.1.2-1/MagickCore/log.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/log.h b/ImageMagick-7.1.2-1/MagickCore/log.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/log.h
rename to ImageMagick-7.1.2-1/MagickCore/log.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magic-private.h b/ImageMagick-7.1.2-1/MagickCore/magic-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magic-private.h
rename to ImageMagick-7.1.2-1/MagickCore/magic-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magic.c b/ImageMagick-7.1.2-1/MagickCore/magic.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magic.c
rename to ImageMagick-7.1.2-1/MagickCore/magic.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/magic.h b/ImageMagick-7.1.2-1/MagickCore/magic.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magic.h
rename to ImageMagick-7.1.2-1/MagickCore/magic.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magick-config.h b/ImageMagick-7.1.2-1/MagickCore/magick-config.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magick-config.h
rename to ImageMagick-7.1.2-1/MagickCore/magick-config.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magick-private.h b/ImageMagick-7.1.2-1/MagickCore/magick-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magick-private.h
rename to ImageMagick-7.1.2-1/MagickCore/magick-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magick-type.h b/ImageMagick-7.1.2-1/MagickCore/magick-type.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magick-type.h
rename to ImageMagick-7.1.2-1/MagickCore/magick-type.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/magick.c b/ImageMagick-7.1.2-1/MagickCore/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magick.c
rename to ImageMagick-7.1.2-1/MagickCore/magick.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/magick.h b/ImageMagick-7.1.2-1/MagickCore/magick.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/magick.h
rename to ImageMagick-7.1.2-1/MagickCore/magick.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/matrix-private.h b/ImageMagick-7.1.2-1/MagickCore/matrix-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/matrix-private.h
rename to ImageMagick-7.1.2-1/MagickCore/matrix-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/matrix.c b/ImageMagick-7.1.2-1/MagickCore/matrix.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/matrix.c
rename to ImageMagick-7.1.2-1/MagickCore/matrix.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/matrix.h b/ImageMagick-7.1.2-1/MagickCore/matrix.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/matrix.h
rename to ImageMagick-7.1.2-1/MagickCore/matrix.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/memory-private.h b/ImageMagick-7.1.2-1/MagickCore/memory-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/memory-private.h
rename to ImageMagick-7.1.2-1/MagickCore/memory-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/memory.c b/ImageMagick-7.1.2-1/MagickCore/memory.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/memory.c
rename to ImageMagick-7.1.2-1/MagickCore/memory.c
index 1572c9387..98bf1ac2a 100644
--- a/ImageMagick-7.1.2-0/MagickCore/memory.c
+++ b/ImageMagick-7.1.2-1/MagickCore/memory.c
@@ -1050,7 +1050,7 @@ static size_t GetMaxMemoryRequestFromPolicy(void)
     *value;
 
   size_t
-    max=(size_t) MAGICK_SSIZE_MAX;
+    max_memory = (size_t) MAGICK_SSIZE_MAX;
 
   value=GetPolicyValue("system:max-memory-request");
   if (value != (char *) NULL)
@@ -1058,11 +1058,11 @@ static size_t GetMaxMemoryRequestFromPolicy(void)
       /*
         The security policy sets a max memory request limit.
       */
-      max=MagickMax(StringToSizeType(value,100.0),StringToSizeType(
+      max_memory=MagickMax(StringToSizeType(value,100.0),StringToSizeType(
         MinMemoryRequest,100.0));
       value=DestroyString(value);
     }
-  return(MagickMin(max,(size_t) MAGICK_SSIZE_MAX));
+  return(MagickMin(max_memory,(size_t) MAGICK_SSIZE_MAX));
 }
 
 MagickExport size_t GetMaxMemoryRequest(void)
diff --git a/ImageMagick-7.1.2-0/MagickCore/memory_.h b/ImageMagick-7.1.2-1/MagickCore/memory_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/memory_.h
rename to ImageMagick-7.1.2-1/MagickCore/memory_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/method-attribute.h b/ImageMagick-7.1.2-1/MagickCore/method-attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/method-attribute.h
rename to ImageMagick-7.1.2-1/MagickCore/method-attribute.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/methods.h b/ImageMagick-7.1.2-1/MagickCore/methods.h
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/methods.h
rename to ImageMagick-7.1.2-1/MagickCore/methods.h
index 9c9b5d822..6abcad5cb 100644
--- a/ImageMagick-7.1.2-0/MagickCore/methods.h
+++ b/ImageMagick-7.1.2-1/MagickCore/methods.h
@@ -976,6 +976,7 @@ extern "C" {
 #define RegisterSCREENSHOTImage  PrependMagickMethod(RegisterSCREENSHOTImage)
 #define RegisterSCRImage  PrependMagickMethod(RegisterSCRImage)
 #define RegisterSCTImage  PrependMagickMethod(RegisterSCTImage)
+#define RegisterSF3Image  PrependMagickMethod(RegisterSF3Image)
 #define RegisterSFWImage  PrependMagickMethod(RegisterSFWImage)
 #define RegisterSGIImage  PrependMagickMethod(RegisterSGIImage)
 #define RegisterSIXELImage  PrependMagickMethod(RegisterSIXELImage)
@@ -1360,6 +1361,7 @@ extern "C" {
 #define UnregisterSCREENSHOTImage  PrependMagickMethod(UnregisterSCREENSHOTImage)
 #define UnregisterSCRImage  PrependMagickMethod(UnregisterSCRImage)
 #define UnregisterSCTImage  PrependMagickMethod(UnregisterSCTImage)
+#define UnregisterSF3Image  PrependMagickMethod(UnregisterSF3Image)
 #define UnregisterSFWImage  PrependMagickMethod(UnregisterSFWImage)
 #define UnregisterSGIImage  PrependMagickMethod(UnregisterSGIImage)
 #define UnregisterSIXELImage  PrependMagickMethod(UnregisterSIXELImage)
diff --git a/ImageMagick-7.1.2-0/MagickCore/mime-private.h b/ImageMagick-7.1.2-1/MagickCore/mime-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/mime-private.h
rename to ImageMagick-7.1.2-1/MagickCore/mime-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/mime.c b/ImageMagick-7.1.2-1/MagickCore/mime.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/mime.c
rename to ImageMagick-7.1.2-1/MagickCore/mime.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/mime.h b/ImageMagick-7.1.2-1/MagickCore/mime.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/mime.h
rename to ImageMagick-7.1.2-1/MagickCore/mime.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/module-private.h b/ImageMagick-7.1.2-1/MagickCore/module-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/module-private.h
rename to ImageMagick-7.1.2-1/MagickCore/module-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/module.c b/ImageMagick-7.1.2-1/MagickCore/module.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/module.c
rename to ImageMagick-7.1.2-1/MagickCore/module.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/module.h b/ImageMagick-7.1.2-1/MagickCore/module.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/module.h
rename to ImageMagick-7.1.2-1/MagickCore/module.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/monitor-private.h b/ImageMagick-7.1.2-1/MagickCore/monitor-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/monitor-private.h
rename to ImageMagick-7.1.2-1/MagickCore/monitor-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/monitor.c b/ImageMagick-7.1.2-1/MagickCore/monitor.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/monitor.c
rename to ImageMagick-7.1.2-1/MagickCore/monitor.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/monitor.h b/ImageMagick-7.1.2-1/MagickCore/monitor.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/monitor.h
rename to ImageMagick-7.1.2-1/MagickCore/monitor.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/montage.c b/ImageMagick-7.1.2-1/MagickCore/montage.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/montage.c
rename to ImageMagick-7.1.2-1/MagickCore/montage.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/montage.h b/ImageMagick-7.1.2-1/MagickCore/montage.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/montage.h
rename to ImageMagick-7.1.2-1/MagickCore/montage.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/morphology-private.h b/ImageMagick-7.1.2-1/MagickCore/morphology-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/morphology-private.h
rename to ImageMagick-7.1.2-1/MagickCore/morphology-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/morphology.c b/ImageMagick-7.1.2-1/MagickCore/morphology.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/morphology.c
rename to ImageMagick-7.1.2-1/MagickCore/morphology.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/morphology.h b/ImageMagick-7.1.2-1/MagickCore/morphology.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/morphology.h
rename to ImageMagick-7.1.2-1/MagickCore/morphology.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/mutex.h b/ImageMagick-7.1.2-1/MagickCore/mutex.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/mutex.h
rename to ImageMagick-7.1.2-1/MagickCore/mutex.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/nt-base-private.h b/ImageMagick-7.1.2-1/MagickCore/nt-base-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/nt-base-private.h
rename to ImageMagick-7.1.2-1/MagickCore/nt-base-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/nt-base.c b/ImageMagick-7.1.2-1/MagickCore/nt-base.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/nt-base.c
rename to ImageMagick-7.1.2-1/MagickCore/nt-base.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/nt-base.h b/ImageMagick-7.1.2-1/MagickCore/nt-base.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/nt-base.h
rename to ImageMagick-7.1.2-1/MagickCore/nt-base.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/nt-feature.c b/ImageMagick-7.1.2-1/MagickCore/nt-feature.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/nt-feature.c
rename to ImageMagick-7.1.2-1/MagickCore/nt-feature.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/nt-feature.h b/ImageMagick-7.1.2-1/MagickCore/nt-feature.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/nt-feature.h
rename to ImageMagick-7.1.2-1/MagickCore/nt-feature.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/opencl-private.h b/ImageMagick-7.1.2-1/MagickCore/opencl-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/opencl-private.h
rename to ImageMagick-7.1.2-1/MagickCore/opencl-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/opencl.c b/ImageMagick-7.1.2-1/MagickCore/opencl.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/opencl.c
rename to ImageMagick-7.1.2-1/MagickCore/opencl.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/opencl.h b/ImageMagick-7.1.2-1/MagickCore/opencl.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/opencl.h
rename to ImageMagick-7.1.2-1/MagickCore/opencl.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/option-private.h b/ImageMagick-7.1.2-1/MagickCore/option-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/option-private.h
rename to ImageMagick-7.1.2-1/MagickCore/option-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/option.c b/ImageMagick-7.1.2-1/MagickCore/option.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/option.c
rename to ImageMagick-7.1.2-1/MagickCore/option.c
index eee6f943c..f844f44d6 100644
--- a/ImageMagick-7.1.2-0/MagickCore/option.c
+++ b/ImageMagick-7.1.2-1/MagickCore/option.c
@@ -959,8 +959,8 @@ static const OptionInfo
     { "+local-contrast", 0L, DeprecateOptionFlag, MagickTrue },
     { "-local-contrast", 1L, SimpleOperatorFlag, MagickFalse },
     { "+log", 0L, DeprecateOptionFlag, MagickFalse },
-    { "-log", 1L, GlobalOptionFlag, MagickFalse },
-    { "+loop", 0L, ImageInfoOptionFlag, MagickFalse },
+    { "-log", 1L, GlobalOptionFlag | NeverInterpretArgsFlag, MagickFalse },
+    { "+loop", 0L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "-loop", 1L, ImageInfoOptionFlag, MagickFalse },
     { "+lowlight-color", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-lowlight-color", 1L, ImageInfoOptionFlag, MagickFalse },
@@ -2361,6 +2361,21 @@ static const OptionInfo
 %    o clone_info: the source image info for options to clone.
 %
 */
+
+typedef char
+  *(*CloneKeyFunc)(const char *),
+  *(*CloneValueFunc)(const char *);
+
+static inline void *CloneOptionKey(void *key)
+{
+  return((void *) ((CloneKeyFunc) ConstantString)((const char *) key));
+}
+
+static inline void *CloneOptionValue(void *value)
+{
+  return((void *) ((CloneValueFunc) ConstantString)((const char *) value));
+}
+
 MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info,
   const ImageInfo *clone_info)
 {
@@ -2376,7 +2391,7 @@ MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info,
       if (image_info->options != (void *) NULL)
         DestroyImageOptions(image_info);
       image_info->options=CloneSplayTree((SplayTreeInfo *) clone_info->options,
-        (void *(*)(void *)) ConstantString,(void *(*)(void *)) ConstantString);
+        CloneOptionKey,CloneOptionValue);
     }
   return(MagickTrue);
 }
diff --git a/ImageMagick-7.1.2-0/MagickCore/option.h b/ImageMagick-7.1.2-1/MagickCore/option.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/option.h
rename to ImageMagick-7.1.2-1/MagickCore/option.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/paint.c b/ImageMagick-7.1.2-1/MagickCore/paint.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/paint.c
rename to ImageMagick-7.1.2-1/MagickCore/paint.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/paint.h b/ImageMagick-7.1.2-1/MagickCore/paint.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/paint.h
rename to ImageMagick-7.1.2-1/MagickCore/paint.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/pixel-accessor.h b/ImageMagick-7.1.2-1/MagickCore/pixel-accessor.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/pixel-accessor.h
rename to ImageMagick-7.1.2-1/MagickCore/pixel-accessor.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/pixel-private.h b/ImageMagick-7.1.2-1/MagickCore/pixel-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/pixel-private.h
rename to ImageMagick-7.1.2-1/MagickCore/pixel-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/pixel.c b/ImageMagick-7.1.2-1/MagickCore/pixel.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/pixel.c
rename to ImageMagick-7.1.2-1/MagickCore/pixel.c
index f576f5689..c985256d8 100644
--- a/ImageMagick-7.1.2-0/MagickCore/pixel.c
+++ b/ImageMagick-7.1.2-1/MagickCore/pixel.c
@@ -5947,7 +5947,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixel(const Image *image,
     else
       error=alpha*(double) p[i]-target_alpha*
         GetPixelChannel(target_image,channel,q);
-    if ((error*error) > fuzz)
+    if (MagickSafeSignificantError(error*error,fuzz) != MagickFalse)
       return(MagickFalse);
   }
   return(MagickTrue);
@@ -6019,7 +6019,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
         (double) OpaqueAlpha)-(q->alpha_trait != UndefinedPixelTrait ?
         q->alpha : (double) OpaqueAlpha);
       distance=pixel*pixel;
-      if (distance > fuzz)
+      if (MagickSafeSignificantError(distance*distance,fuzz) != MagickFalse)
         return(MagickFalse);
       /*
         Generate a alpha scaling factor to generate a 4D cone on colorspace.
@@ -6039,7 +6039,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
     {
       pixel=p->black-q->black;
       distance+=pixel*pixel*scale;
-      if (distance > fuzz)
+      if (MagickSafeSignificantError(distance*distance,fuzz) != MagickFalse)
         return(MagickFalse);
       scale*=QuantumScale*((double) QuantumRange-(double) p->black);
       scale*=QuantumScale*((double) QuantumRange-(double) q->black);
@@ -6062,15 +6062,15 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
       pixel*=2.0;
     }
   distance+=pixel*pixel*scale;
-  if (distance > fuzz)
+  if (MagickSafeSignificantError(distance,fuzz) != MagickFalse)
     return(MagickFalse);
   pixel=p->green-q->green;
   distance+=pixel*pixel*scale;
-  if (distance > fuzz)
+  if (MagickSafeSignificantError(distance,fuzz) != MagickFalse)
     return(MagickFalse);
   pixel=p->blue-q->blue;
   distance+=pixel*pixel*scale;
-  if (distance > fuzz)
+  if (MagickSafeSignificantError(distance,fuzz) != MagickFalse)
     return(MagickFalse);
   return(MagickTrue);
 }
diff --git a/ImageMagick-7.1.2-0/MagickCore/pixel.h b/ImageMagick-7.1.2-1/MagickCore/pixel.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/pixel.h
rename to ImageMagick-7.1.2-1/MagickCore/pixel.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/policy-private.h b/ImageMagick-7.1.2-1/MagickCore/policy-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/policy-private.h
rename to ImageMagick-7.1.2-1/MagickCore/policy-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/policy.c b/ImageMagick-7.1.2-1/MagickCore/policy.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/policy.c
rename to ImageMagick-7.1.2-1/MagickCore/policy.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/policy.h b/ImageMagick-7.1.2-1/MagickCore/policy.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/policy.h
rename to ImageMagick-7.1.2-1/MagickCore/policy.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/prepress.c b/ImageMagick-7.1.2-1/MagickCore/prepress.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/prepress.c
rename to ImageMagick-7.1.2-1/MagickCore/prepress.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/prepress.h b/ImageMagick-7.1.2-1/MagickCore/prepress.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/prepress.h
rename to ImageMagick-7.1.2-1/MagickCore/prepress.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/profile-private.h b/ImageMagick-7.1.2-1/MagickCore/profile-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/profile-private.h
rename to ImageMagick-7.1.2-1/MagickCore/profile-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/profile.c b/ImageMagick-7.1.2-1/MagickCore/profile.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/profile.c
rename to ImageMagick-7.1.2-1/MagickCore/profile.c
index fac191845..8e38b301b 100644
--- a/ImageMagick-7.1.2-0/MagickCore/profile.c
+++ b/ImageMagick-7.1.2-1/MagickCore/profile.c
@@ -143,6 +143,23 @@ typedef struct _CMSExceptionInfo
 %    o clone_image: the clone image.
 %
 */
+
+typedef char
+  *(*CloneKeyFunc)(const char *);
+
+typedef StringInfo
+  *(*CloneValueFunc)(const StringInfo *);
+
+static inline void *CloneProfileKey(void *key)
+{
+  return((void *) ((CloneKeyFunc) ConstantString)((const char *) key));
+}
+
+static inline void *CloneProfileValue(void *value)
+{
+  return((void *) ((CloneValueFunc) CloneStringInfo)((const StringInfo *) value));
+}
+
 MagickExport MagickBooleanType CloneImageProfiles(Image *image,
   const Image *clone_image)
 {
@@ -157,7 +174,7 @@ MagickExport MagickBooleanType CloneImageProfiles(Image *image,
       if (image->profiles != (void *) NULL)
         DestroyImageProfiles(image);
       image->profiles=CloneSplayTree((SplayTreeInfo *) clone_image->profiles,
-        (void *(*)(void *)) ConstantString,(void *(*)(void *)) CloneStringInfo);
+        CloneProfileKey,CloneProfileValue);
     }
   return(MagickTrue);
 }
diff --git a/ImageMagick-7.1.2-0/MagickCore/profile.h b/ImageMagick-7.1.2-1/MagickCore/profile.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/profile.h
rename to ImageMagick-7.1.2-1/MagickCore/profile.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/property.c b/ImageMagick-7.1.2-1/MagickCore/property.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/property.c
rename to ImageMagick-7.1.2-1/MagickCore/property.c
index 09ae365df..976ca34d7 100644
--- a/ImageMagick-7.1.2-0/MagickCore/property.c
+++ b/ImageMagick-7.1.2-1/MagickCore/property.c
@@ -131,6 +131,21 @@
 %    o clone_image: the clone image.
 %
 */
+
+typedef char
+  *(*CloneKeyFunc)(const char *),
+  *(*CloneValueFunc)(const char *);
+
+static inline void *ClonePropertyKey(void *key)
+{
+  return((void *) ((CloneKeyFunc) ConstantString)((const char *) key));
+}
+
+static inline void *ClonePropertyValue(void *value)
+{
+  return((void *) ((CloneValueFunc) ConstantString)((const char *) value));
+}
+
 MagickExport MagickBooleanType CloneImageProperties(Image *image,
   const Image *clone_image)
 {
@@ -195,8 +210,7 @@ MagickExport MagickBooleanType CloneImageProperties(Image *image,
       if (image->properties != (void *) NULL)
         DestroyImageProperties(image);
       image->properties=CloneSplayTree((SplayTreeInfo *)
-        clone_image->properties,(void *(*)(void *)) ConstantString,
-        (void *(*)(void *)) ConstantString);
+        clone_image->properties,ClonePropertyKey,ClonePropertyValue);
     }
   return(MagickTrue);
 }
diff --git a/ImageMagick-7.1.2-0/MagickCore/property.h b/ImageMagick-7.1.2-1/MagickCore/property.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/property.h
rename to ImageMagick-7.1.2-1/MagickCore/property.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantize.c b/ImageMagick-7.1.2-1/MagickCore/quantize.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantize.c
rename to ImageMagick-7.1.2-1/MagickCore/quantize.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantize.h b/ImageMagick-7.1.2-1/MagickCore/quantize.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantize.h
rename to ImageMagick-7.1.2-1/MagickCore/quantize.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantum-export.c b/ImageMagick-7.1.2-1/MagickCore/quantum-export.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantum-export.c
rename to ImageMagick-7.1.2-1/MagickCore/quantum-export.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantum-import.c b/ImageMagick-7.1.2-1/MagickCore/quantum-import.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantum-import.c
rename to ImageMagick-7.1.2-1/MagickCore/quantum-import.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantum-private.h b/ImageMagick-7.1.2-1/MagickCore/quantum-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantum-private.h
rename to ImageMagick-7.1.2-1/MagickCore/quantum-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantum.c b/ImageMagick-7.1.2-1/MagickCore/quantum.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantum.c
rename to ImageMagick-7.1.2-1/MagickCore/quantum.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/quantum.h b/ImageMagick-7.1.2-1/MagickCore/quantum.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/quantum.h
rename to ImageMagick-7.1.2-1/MagickCore/quantum.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/random-private.h b/ImageMagick-7.1.2-1/MagickCore/random-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/random-private.h
rename to ImageMagick-7.1.2-1/MagickCore/random-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/random.c b/ImageMagick-7.1.2-1/MagickCore/random.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/random.c
rename to ImageMagick-7.1.2-1/MagickCore/random.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/random_.h b/ImageMagick-7.1.2-1/MagickCore/random_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/random_.h
rename to ImageMagick-7.1.2-1/MagickCore/random_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/registry-private.h b/ImageMagick-7.1.2-1/MagickCore/registry-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/registry-private.h
rename to ImageMagick-7.1.2-1/MagickCore/registry-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/registry.c b/ImageMagick-7.1.2-1/MagickCore/registry.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/registry.c
rename to ImageMagick-7.1.2-1/MagickCore/registry.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/registry.h b/ImageMagick-7.1.2-1/MagickCore/registry.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/registry.h
rename to ImageMagick-7.1.2-1/MagickCore/registry.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resample-private.h b/ImageMagick-7.1.2-1/MagickCore/resample-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resample-private.h
rename to ImageMagick-7.1.2-1/MagickCore/resample-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resample.c b/ImageMagick-7.1.2-1/MagickCore/resample.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resample.c
rename to ImageMagick-7.1.2-1/MagickCore/resample.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/resample.h b/ImageMagick-7.1.2-1/MagickCore/resample.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resample.h
rename to ImageMagick-7.1.2-1/MagickCore/resample.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resize-private.h b/ImageMagick-7.1.2-1/MagickCore/resize-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resize-private.h
rename to ImageMagick-7.1.2-1/MagickCore/resize-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resize.c b/ImageMagick-7.1.2-1/MagickCore/resize.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resize.c
rename to ImageMagick-7.1.2-1/MagickCore/resize.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/resize.h b/ImageMagick-7.1.2-1/MagickCore/resize.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resize.h
rename to ImageMagick-7.1.2-1/MagickCore/resize.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resource-private.h b/ImageMagick-7.1.2-1/MagickCore/resource-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resource-private.h
rename to ImageMagick-7.1.2-1/MagickCore/resource-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/resource.c b/ImageMagick-7.1.2-1/MagickCore/resource.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resource.c
rename to ImageMagick-7.1.2-1/MagickCore/resource.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/resource_.h b/ImageMagick-7.1.2-1/MagickCore/resource_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/resource_.h
rename to ImageMagick-7.1.2-1/MagickCore/resource_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/segment.c b/ImageMagick-7.1.2-1/MagickCore/segment.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/segment.c
rename to ImageMagick-7.1.2-1/MagickCore/segment.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/segment.h b/ImageMagick-7.1.2-1/MagickCore/segment.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/segment.h
rename to ImageMagick-7.1.2-1/MagickCore/segment.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/semaphore-private.h b/ImageMagick-7.1.2-1/MagickCore/semaphore-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/semaphore-private.h
rename to ImageMagick-7.1.2-1/MagickCore/semaphore-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/semaphore.c b/ImageMagick-7.1.2-1/MagickCore/semaphore.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/semaphore.c
rename to ImageMagick-7.1.2-1/MagickCore/semaphore.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/semaphore.h b/ImageMagick-7.1.2-1/MagickCore/semaphore.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/semaphore.h
rename to ImageMagick-7.1.2-1/MagickCore/semaphore.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/shear.c b/ImageMagick-7.1.2-1/MagickCore/shear.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/shear.c
rename to ImageMagick-7.1.2-1/MagickCore/shear.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/shear.h b/ImageMagick-7.1.2-1/MagickCore/shear.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/shear.h
rename to ImageMagick-7.1.2-1/MagickCore/shear.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/signature-private.h b/ImageMagick-7.1.2-1/MagickCore/signature-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/signature-private.h
rename to ImageMagick-7.1.2-1/MagickCore/signature-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/signature.c b/ImageMagick-7.1.2-1/MagickCore/signature.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/signature.c
rename to ImageMagick-7.1.2-1/MagickCore/signature.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/signature.h b/ImageMagick-7.1.2-1/MagickCore/signature.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/signature.h
rename to ImageMagick-7.1.2-1/MagickCore/signature.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/splay-tree.c b/ImageMagick-7.1.2-1/MagickCore/splay-tree.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/splay-tree.c
rename to ImageMagick-7.1.2-1/MagickCore/splay-tree.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/splay-tree.h b/ImageMagick-7.1.2-1/MagickCore/splay-tree.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/splay-tree.h
rename to ImageMagick-7.1.2-1/MagickCore/splay-tree.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/static.c b/ImageMagick-7.1.2-1/MagickCore/static.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/static.c
rename to ImageMagick-7.1.2-1/MagickCore/static.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/static.h b/ImageMagick-7.1.2-1/MagickCore/static.h
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/static.h
rename to ImageMagick-7.1.2-1/MagickCore/static.h
index b1f15346c..9fcb95a2c 100644
--- a/ImageMagick-7.1.2-0/MagickCore/static.h
+++ b/ImageMagick-7.1.2-1/MagickCore/static.h
@@ -134,6 +134,7 @@ extern ModuleExport size_t
   RegisterSCRImage(void),
   RegisterSCREENSHOTImage(void),
   RegisterSCTImage(void),
+  RegisterSF3Image(void),
   RegisterSFWImage(void),
   RegisterSGIImage(void),
   RegisterSIXELImage(void),
@@ -275,6 +276,7 @@ extern ModuleExport void
   UnregisterSCRImage(void),
   UnregisterSCREENSHOTImage(void),
   UnregisterSCTImage(void),
+  UnregisterSF3Image(void),
   UnregisterSFWImage(void),
   UnregisterSGIImage(void),
   UnregisterSIXELImage(void),
diff --git a/ImageMagick-7.1.2-0/MagickCore/statistic-private.h b/ImageMagick-7.1.2-1/MagickCore/statistic-private.h
similarity index 83%
rename from ImageMagick-7.1.2-0/MagickCore/statistic-private.h
rename to ImageMagick-7.1.2-1/MagickCore/statistic-private.h
index b306192ff..4e22b10a5 100644
--- a/ImageMagick-7.1.2-0/MagickCore/statistic-private.h
+++ b/ImageMagick-7.1.2-1/MagickCore/statistic-private.h
@@ -22,6 +22,13 @@
 extern "C" {
 #endif
 
+static inline MagickBooleanType MagickSafeSignificantError(const double error,
+  const double fuzz)
+{
+  double threshold = (fuzz > 0.0 ? fuzz : MagickEpsilon)*(1.0+MagickEpsilon);
+  return(error > threshold ? MagickTrue : MagickFalse);
+}
+
 static inline double MagickSafeLog10(const double x)
 {
   if (x < MagickEpsilon)
diff --git a/ImageMagick-7.1.2-0/MagickCore/statistic.c b/ImageMagick-7.1.2-1/MagickCore/statistic.c
similarity index 99%
rename from ImageMagick-7.1.2-0/MagickCore/statistic.c
rename to ImageMagick-7.1.2-1/MagickCore/statistic.c
index 9578ace98..86fdd67f3 100644
--- a/ImageMagick-7.1.2-0/MagickCore/statistic.c
+++ b/ImageMagick-7.1.2-1/MagickCore/statistic.c
@@ -1843,9 +1843,6 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
   CacheView
     *image_view;
 
-  const Quantum
-    *magick_restrict q;
-
   MagickBooleanType
     status;
 
@@ -1861,12 +1858,6 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   status=MagickTrue;
   image_view=AcquireVirtualCacheView(image,exception);
-  q=GetCacheViewVirtualPixels(image_view,0,0,1,1,exception);
-  if (q != (const Quantum *) NULL)
-    {
-      range_info.maxima=(double) q[0];
-      range_info.minima=(double) q[0];
-    }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static) shared(range_info,status) \
     magick_number_threads(image,image,image->rows,1)
diff --git a/ImageMagick-7.1.2-0/MagickCore/statistic.h b/ImageMagick-7.1.2-1/MagickCore/statistic.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/statistic.h
rename to ImageMagick-7.1.2-1/MagickCore/statistic.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/stream-private.h b/ImageMagick-7.1.2-1/MagickCore/stream-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/stream-private.h
rename to ImageMagick-7.1.2-1/MagickCore/stream-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/stream.c b/ImageMagick-7.1.2-1/MagickCore/stream.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/stream.c
rename to ImageMagick-7.1.2-1/MagickCore/stream.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/stream.h b/ImageMagick-7.1.2-1/MagickCore/stream.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/stream.h
rename to ImageMagick-7.1.2-1/MagickCore/stream.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/string-private.h b/ImageMagick-7.1.2-1/MagickCore/string-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/string-private.h
rename to ImageMagick-7.1.2-1/MagickCore/string-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/string.c b/ImageMagick-7.1.2-1/MagickCore/string.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/string.c
rename to ImageMagick-7.1.2-1/MagickCore/string.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/string_.h b/ImageMagick-7.1.2-1/MagickCore/string_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/string_.h
rename to ImageMagick-7.1.2-1/MagickCore/string_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/studio.h b/ImageMagick-7.1.2-1/MagickCore/studio.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/studio.h
rename to ImageMagick-7.1.2-1/MagickCore/studio.h
index 16b252228..0948103ac 100644
--- a/ImageMagick-7.1.2-0/MagickCore/studio.h
+++ b/ImageMagick-7.1.2-1/MagickCore/studio.h
@@ -18,15 +18,6 @@
 #ifndef MAGICKCORE_STUDIO_H
 #define MAGICKCORE_STUDIO_H
 
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-#  include <omp.h>
-#  define MAGICKCORE_OPENMP_SUPPORT  1
-#endif
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 #if defined(WIN32) || defined(WIN64) || defined(_WIN32_WINNT)
 #  define MAGICKCORE_WINDOWS_SUPPORT
 #else
@@ -52,6 +43,15 @@ extern "C" {
 # endif
 #endif
 
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+#  include <omp.h>
+#  define MAGICKCORE_OPENMP_SUPPORT  1
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 #if defined(MAGICKCORE_NAMESPACE_PREFIX)
 # include "MagickCore/methods.h"
 #endif
diff --git a/ImageMagick-7.1.2-0/MagickCore/thread-private.h b/ImageMagick-7.1.2-1/MagickCore/thread-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/thread-private.h
rename to ImageMagick-7.1.2-1/MagickCore/thread-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/thread.c b/ImageMagick-7.1.2-1/MagickCore/thread.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/thread.c
rename to ImageMagick-7.1.2-1/MagickCore/thread.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/thread_.h b/ImageMagick-7.1.2-1/MagickCore/thread_.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/thread_.h
rename to ImageMagick-7.1.2-1/MagickCore/thread_.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/threshold.c b/ImageMagick-7.1.2-1/MagickCore/threshold.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/threshold.c
rename to ImageMagick-7.1.2-1/MagickCore/threshold.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/threshold.h b/ImageMagick-7.1.2-1/MagickCore/threshold.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/threshold.h
rename to ImageMagick-7.1.2-1/MagickCore/threshold.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/timer-private.h b/ImageMagick-7.1.2-1/MagickCore/timer-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/timer-private.h
rename to ImageMagick-7.1.2-1/MagickCore/timer-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/timer.c b/ImageMagick-7.1.2-1/MagickCore/timer.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/timer.c
rename to ImageMagick-7.1.2-1/MagickCore/timer.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/timer.h b/ImageMagick-7.1.2-1/MagickCore/timer.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/timer.h
rename to ImageMagick-7.1.2-1/MagickCore/timer.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/token-private.h b/ImageMagick-7.1.2-1/MagickCore/token-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/token-private.h
rename to ImageMagick-7.1.2-1/MagickCore/token-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/token.c b/ImageMagick-7.1.2-1/MagickCore/token.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/token.c
rename to ImageMagick-7.1.2-1/MagickCore/token.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/token.h b/ImageMagick-7.1.2-1/MagickCore/token.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/token.h
rename to ImageMagick-7.1.2-1/MagickCore/token.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/transform-private.h b/ImageMagick-7.1.2-1/MagickCore/transform-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/transform-private.h
rename to ImageMagick-7.1.2-1/MagickCore/transform-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/transform.c b/ImageMagick-7.1.2-1/MagickCore/transform.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/transform.c
rename to ImageMagick-7.1.2-1/MagickCore/transform.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/transform.h b/ImageMagick-7.1.2-1/MagickCore/transform.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/transform.h
rename to ImageMagick-7.1.2-1/MagickCore/transform.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/type-private.h b/ImageMagick-7.1.2-1/MagickCore/type-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/type-private.h
rename to ImageMagick-7.1.2-1/MagickCore/type-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/type.c b/ImageMagick-7.1.2-1/MagickCore/type.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/type.c
rename to ImageMagick-7.1.2-1/MagickCore/type.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/type.h b/ImageMagick-7.1.2-1/MagickCore/type.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/type.h
rename to ImageMagick-7.1.2-1/MagickCore/type.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/utility-private.h b/ImageMagick-7.1.2-1/MagickCore/utility-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/utility-private.h
rename to ImageMagick-7.1.2-1/MagickCore/utility-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/utility.c b/ImageMagick-7.1.2-1/MagickCore/utility.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/utility.c
rename to ImageMagick-7.1.2-1/MagickCore/utility.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/utility.h b/ImageMagick-7.1.2-1/MagickCore/utility.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/utility.h
rename to ImageMagick-7.1.2-1/MagickCore/utility.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/version-private.h b/ImageMagick-7.1.2-1/MagickCore/version-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/version-private.h
rename to ImageMagick-7.1.2-1/MagickCore/version-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/version.c b/ImageMagick-7.1.2-1/MagickCore/version.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/version.c
rename to ImageMagick-7.1.2-1/MagickCore/version.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/vision.c b/ImageMagick-7.1.2-1/MagickCore/vision.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/vision.c
rename to ImageMagick-7.1.2-1/MagickCore/vision.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/vision.h b/ImageMagick-7.1.2-1/MagickCore/vision.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/vision.h
rename to ImageMagick-7.1.2-1/MagickCore/vision.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/visual-effects.c b/ImageMagick-7.1.2-1/MagickCore/visual-effects.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/visual-effects.c
rename to ImageMagick-7.1.2-1/MagickCore/visual-effects.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/visual-effects.h b/ImageMagick-7.1.2-1/MagickCore/visual-effects.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/visual-effects.h
rename to ImageMagick-7.1.2-1/MagickCore/visual-effects.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/vms.c b/ImageMagick-7.1.2-1/MagickCore/vms.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/vms.c
rename to ImageMagick-7.1.2-1/MagickCore/vms.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/vms.h b/ImageMagick-7.1.2-1/MagickCore/vms.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/vms.h
rename to ImageMagick-7.1.2-1/MagickCore/vms.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/widget-private.h b/ImageMagick-7.1.2-1/MagickCore/widget-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/widget-private.h
rename to ImageMagick-7.1.2-1/MagickCore/widget-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/widget.c b/ImageMagick-7.1.2-1/MagickCore/widget.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/widget.c
rename to ImageMagick-7.1.2-1/MagickCore/widget.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/widget.h b/ImageMagick-7.1.2-1/MagickCore/widget.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/widget.h
rename to ImageMagick-7.1.2-1/MagickCore/widget.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/xml-tree-private.h b/ImageMagick-7.1.2-1/MagickCore/xml-tree-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xml-tree-private.h
rename to ImageMagick-7.1.2-1/MagickCore/xml-tree-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/xml-tree.c b/ImageMagick-7.1.2-1/MagickCore/xml-tree.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xml-tree.c
rename to ImageMagick-7.1.2-1/MagickCore/xml-tree.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/xml-tree.h b/ImageMagick-7.1.2-1/MagickCore/xml-tree.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xml-tree.h
rename to ImageMagick-7.1.2-1/MagickCore/xml-tree.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/xwindow-private.h b/ImageMagick-7.1.2-1/MagickCore/xwindow-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xwindow-private.h
rename to ImageMagick-7.1.2-1/MagickCore/xwindow-private.h
diff --git a/ImageMagick-7.1.2-0/MagickCore/xwindow.c b/ImageMagick-7.1.2-1/MagickCore/xwindow.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xwindow.c
rename to ImageMagick-7.1.2-1/MagickCore/xwindow.c
diff --git a/ImageMagick-7.1.2-0/MagickCore/xwindow.h b/ImageMagick-7.1.2-1/MagickCore/xwindow.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickCore/xwindow.h
rename to ImageMagick-7.1.2-1/MagickCore/xwindow.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/MagickWand.h b/ImageMagick-7.1.2-1/MagickWand/MagickWand.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/MagickWand.h
rename to ImageMagick-7.1.2-1/MagickWand/MagickWand.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/animate.c b/ImageMagick-7.1.2-1/MagickWand/animate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/animate.c
rename to ImageMagick-7.1.2-1/MagickWand/animate.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/animate.h b/ImageMagick-7.1.2-1/MagickWand/animate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/animate.h
rename to ImageMagick-7.1.2-1/MagickWand/animate.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/compare.c b/ImageMagick-7.1.2-1/MagickWand/compare.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/compare.c
rename to ImageMagick-7.1.2-1/MagickWand/compare.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/compare.h b/ImageMagick-7.1.2-1/MagickWand/compare.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/compare.h
rename to ImageMagick-7.1.2-1/MagickWand/compare.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/composite.c b/ImageMagick-7.1.2-1/MagickWand/composite.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/composite.c
rename to ImageMagick-7.1.2-1/MagickWand/composite.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/composite.h b/ImageMagick-7.1.2-1/MagickWand/composite.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/composite.h
rename to ImageMagick-7.1.2-1/MagickWand/composite.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/conjure.c b/ImageMagick-7.1.2-1/MagickWand/conjure.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/conjure.c
rename to ImageMagick-7.1.2-1/MagickWand/conjure.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/conjure.h b/ImageMagick-7.1.2-1/MagickWand/conjure.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/conjure.h
rename to ImageMagick-7.1.2-1/MagickWand/conjure.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/deprecate.c b/ImageMagick-7.1.2-1/MagickWand/deprecate.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/deprecate.c
rename to ImageMagick-7.1.2-1/MagickWand/deprecate.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/deprecate.h b/ImageMagick-7.1.2-1/MagickWand/deprecate.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/deprecate.h
rename to ImageMagick-7.1.2-1/MagickWand/deprecate.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/display.c b/ImageMagick-7.1.2-1/MagickWand/display.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/display.c
rename to ImageMagick-7.1.2-1/MagickWand/display.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/display.h b/ImageMagick-7.1.2-1/MagickWand/display.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/display.h
rename to ImageMagick-7.1.2-1/MagickWand/display.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/drawing-wand.c b/ImageMagick-7.1.2-1/MagickWand/drawing-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/drawing-wand.c
rename to ImageMagick-7.1.2-1/MagickWand/drawing-wand.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/drawing-wand.h b/ImageMagick-7.1.2-1/MagickWand/drawing-wand.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/drawing-wand.h
rename to ImageMagick-7.1.2-1/MagickWand/drawing-wand.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/identify.c b/ImageMagick-7.1.2-1/MagickWand/identify.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/identify.c
rename to ImageMagick-7.1.2-1/MagickWand/identify.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/identify.h b/ImageMagick-7.1.2-1/MagickWand/identify.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/identify.h
rename to ImageMagick-7.1.2-1/MagickWand/identify.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/import.c b/ImageMagick-7.1.2-1/MagickWand/import.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/import.c
rename to ImageMagick-7.1.2-1/MagickWand/import.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/import.h b/ImageMagick-7.1.2-1/MagickWand/import.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/import.h
rename to ImageMagick-7.1.2-1/MagickWand/import.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-cli.c b/ImageMagick-7.1.2-1/MagickWand/magick-cli.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-cli.c
rename to ImageMagick-7.1.2-1/MagickWand/magick-cli.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-cli.h b/ImageMagick-7.1.2-1/MagickWand/magick-cli.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-cli.h
rename to ImageMagick-7.1.2-1/MagickWand/magick-cli.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-image.c b/ImageMagick-7.1.2-1/MagickWand/magick-image.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-image.c
rename to ImageMagick-7.1.2-1/MagickWand/magick-image.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-image.h b/ImageMagick-7.1.2-1/MagickWand/magick-image.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-image.h
rename to ImageMagick-7.1.2-1/MagickWand/magick-image.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-property.c b/ImageMagick-7.1.2-1/MagickWand/magick-property.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-property.c
rename to ImageMagick-7.1.2-1/MagickWand/magick-property.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-property.h b/ImageMagick-7.1.2-1/MagickWand/magick-property.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-property.h
rename to ImageMagick-7.1.2-1/MagickWand/magick-property.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-wand-private.h b/ImageMagick-7.1.2-1/MagickWand/magick-wand-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-wand-private.h
rename to ImageMagick-7.1.2-1/MagickWand/magick-wand-private.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/magick-wand.c b/ImageMagick-7.1.2-1/MagickWand/magick-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/magick-wand.c
rename to ImageMagick-7.1.2-1/MagickWand/magick-wand.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/method-attribute.h b/ImageMagick-7.1.2-1/MagickWand/method-attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/method-attribute.h
rename to ImageMagick-7.1.2-1/MagickWand/method-attribute.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/mogrify-private.h b/ImageMagick-7.1.2-1/MagickWand/mogrify-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/mogrify-private.h
rename to ImageMagick-7.1.2-1/MagickWand/mogrify-private.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/mogrify.c b/ImageMagick-7.1.2-1/MagickWand/mogrify.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/mogrify.c
rename to ImageMagick-7.1.2-1/MagickWand/mogrify.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/mogrify.h b/ImageMagick-7.1.2-1/MagickWand/mogrify.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/mogrify.h
rename to ImageMagick-7.1.2-1/MagickWand/mogrify.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/montage.c b/ImageMagick-7.1.2-1/MagickWand/montage.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/montage.c
rename to ImageMagick-7.1.2-1/MagickWand/montage.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/montage.h b/ImageMagick-7.1.2-1/MagickWand/montage.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/montage.h
rename to ImageMagick-7.1.2-1/MagickWand/montage.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/operation-private.h b/ImageMagick-7.1.2-1/MagickWand/operation-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/operation-private.h
rename to ImageMagick-7.1.2-1/MagickWand/operation-private.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/operation.c b/ImageMagick-7.1.2-1/MagickWand/operation.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/operation.c
rename to ImageMagick-7.1.2-1/MagickWand/operation.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/operation.h b/ImageMagick-7.1.2-1/MagickWand/operation.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/operation.h
rename to ImageMagick-7.1.2-1/MagickWand/operation.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/pixel-iterator.c b/ImageMagick-7.1.2-1/MagickWand/pixel-iterator.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/pixel-iterator.c
rename to ImageMagick-7.1.2-1/MagickWand/pixel-iterator.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/pixel-iterator.h b/ImageMagick-7.1.2-1/MagickWand/pixel-iterator.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/pixel-iterator.h
rename to ImageMagick-7.1.2-1/MagickWand/pixel-iterator.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/pixel-wand-private.h b/ImageMagick-7.1.2-1/MagickWand/pixel-wand-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/pixel-wand-private.h
rename to ImageMagick-7.1.2-1/MagickWand/pixel-wand-private.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/pixel-wand.c b/ImageMagick-7.1.2-1/MagickWand/pixel-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/pixel-wand.c
rename to ImageMagick-7.1.2-1/MagickWand/pixel-wand.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/pixel-wand.h b/ImageMagick-7.1.2-1/MagickWand/pixel-wand.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/pixel-wand.h
rename to ImageMagick-7.1.2-1/MagickWand/pixel-wand.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/script-token.c b/ImageMagick-7.1.2-1/MagickWand/script-token.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/script-token.c
rename to ImageMagick-7.1.2-1/MagickWand/script-token.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/script-token.h b/ImageMagick-7.1.2-1/MagickWand/script-token.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/script-token.h
rename to ImageMagick-7.1.2-1/MagickWand/script-token.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/stream.c b/ImageMagick-7.1.2-1/MagickWand/stream.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/stream.c
rename to ImageMagick-7.1.2-1/MagickWand/stream.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/stream.h b/ImageMagick-7.1.2-1/MagickWand/stream.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/stream.h
rename to ImageMagick-7.1.2-1/MagickWand/stream.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/studio.h b/ImageMagick-7.1.2-1/MagickWand/studio.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/studio.h
rename to ImageMagick-7.1.2-1/MagickWand/studio.h
index b62758c8b..b8c115655 100644
--- a/ImageMagick-7.1.2-0/MagickWand/studio.h
+++ b/ImageMagick-7.1.2-1/MagickWand/studio.h
@@ -18,15 +18,6 @@
 #ifndef MAGICKWAND_STUDIO_H
 #define MAGICKWAND_STUDIO_H
 
-#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
-#  include <omp.h>
-#  define MAGICKCORE_OPENMP_SUPPORT  1
-#endif
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 #if defined(WIN32) || defined(WIN64) || defined(_WIN32_WINNT)
 #  define MAGICKWAND_WINDOWS_SUPPORT
 #else
@@ -52,6 +43,15 @@ extern "C" {
 # endif
 #endif
 
+#if defined(_OPENMP) && ((_OPENMP >= 200203) || defined(__OPENCC__))
+#  include <omp.h>
+#  define MAGICKCORE_OPENMP_SUPPORT  1
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 #if !defined(const)
 #  define STDC
 #endif
diff --git a/ImageMagick-7.1.2-0/MagickWand/wand-view.c b/ImageMagick-7.1.2-1/MagickWand/wand-view.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wand-view.c
rename to ImageMagick-7.1.2-1/MagickWand/wand-view.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/wand-view.h b/ImageMagick-7.1.2-1/MagickWand/wand-view.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wand-view.h
rename to ImageMagick-7.1.2-1/MagickWand/wand-view.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/wand.c b/ImageMagick-7.1.2-1/MagickWand/wand.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wand.c
rename to ImageMagick-7.1.2-1/MagickWand/wand.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/wand.h b/ImageMagick-7.1.2-1/MagickWand/wand.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wand.h
rename to ImageMagick-7.1.2-1/MagickWand/wand.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/wandcli-private.h b/ImageMagick-7.1.2-1/MagickWand/wandcli-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wandcli-private.h
rename to ImageMagick-7.1.2-1/MagickWand/wandcli-private.h
diff --git a/ImageMagick-7.1.2-0/MagickWand/wandcli.c b/ImageMagick-7.1.2-1/MagickWand/wandcli.c
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wandcli.c
rename to ImageMagick-7.1.2-1/MagickWand/wandcli.c
diff --git a/ImageMagick-7.1.2-0/MagickWand/wandcli.h b/ImageMagick-7.1.2-1/MagickWand/wandcli.h
similarity index 100%
rename from ImageMagick-7.1.2-0/MagickWand/wandcli.h
rename to ImageMagick-7.1.2-1/MagickWand/wandcli.h
diff --git a/ImageMagick-7.1.2-0/coders/aai.c b/ImageMagick-7.1.2-1/coders/aai.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/aai.c
rename to ImageMagick-7.1.2-1/coders/aai.c
diff --git a/ImageMagick-7.1.2-0/coders/aai.h b/ImageMagick-7.1.2-1/coders/aai.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/aai.h
rename to ImageMagick-7.1.2-1/coders/aai.h
diff --git a/ImageMagick-7.1.2-0/coders/art.c b/ImageMagick-7.1.2-1/coders/art.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/art.c
rename to ImageMagick-7.1.2-1/coders/art.c
diff --git a/ImageMagick-7.1.2-0/coders/art.h b/ImageMagick-7.1.2-1/coders/art.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/art.h
rename to ImageMagick-7.1.2-1/coders/art.h
diff --git a/ImageMagick-7.1.2-0/coders/ashlar.c b/ImageMagick-7.1.2-1/coders/ashlar.c
similarity index 94%
rename from ImageMagick-7.1.2-0/coders/ashlar.c
rename to ImageMagick-7.1.2-1/coders/ashlar.c
index 7b956d417..9124cb61e 100644
--- a/ImageMagick-7.1.2-0/coders/ashlar.c
+++ b/ImageMagick-7.1.2-1/coders/ashlar.c
@@ -53,13 +53,14 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
 #include "MagickCore/option.h"
 #include "MagickCore/property.h"
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
-#include "MagickCore/module.h"
+#include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/xwindow.h"
 #include "MagickCore/xwindow-private.h"
@@ -458,6 +459,9 @@ static inline MagickBooleanType PackAshlarTiles(AshlarInfo *ashlar_info,
   /*
     Pack tiles so they fit the canvas with minimum excess.
   */
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(dynamic) shared(status)
+#endif
   for (i=0; i < (ssize_t) number_tiles; i++)
     tiles[i].order=(i);
   qsort((void *) tiles,number_tiles,sizeof(*tiles),CompareTileHeight);
@@ -483,6 +487,9 @@ static inline MagickBooleanType PackAshlarTiles(AshlarInfo *ashlar_info,
   }
   qsort((void *) tiles,number_tiles,sizeof(*tiles),RestoreTileOrder);
   status=MagickTrue;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(dynamic) shared(status)
+#endif
   for (i=0; i < (ssize_t) number_tiles; i++)
   {
     tiles[i].order=(ssize_t) ((tiles[i].x != (ssize_t) MAGICK_SSIZE_MAX) ||
@@ -618,11 +625,17 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
   value=GetImageOption(image_info,"label");
   extent.width=0;
   extent.height=0;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(dynamic) shared(status,extent) \
+    magick_number_threads(image,image,n,1)
+#endif
   for (i=0; i < n; i++)
   {
     Image
       *tile_image;
 
+    if (status == MagickFalse)
+      continue;
     if ((tiles[i].x == (ssize_t) MAGICK_SSIZE_MAX) ||
         (tiles[i].y == (ssize_t) MAGICK_SSIZE_MAX))
       continue;
@@ -630,9 +643,14 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
       ((ssize_t) tiles[i].width-2*geometry.x),(size_t)
       ((ssize_t) tiles[i].height-2*geometry.y),image->filter,exception);
     if (tile_image == (Image *) NULL)
-      continue;
-    (void) CompositeImage(ashlar_image,tile_image,image->compose,MagickTrue,
+      {
+        status=MagickFalse;
+        continue;
+      }
+    status=CompositeImage(ashlar_image,tile_image,image->compose,MagickTrue,
       tiles[i].x+geometry.x,tiles[i].y+geometry.y,exception);
+    if (status == MagickFalse)
+      continue;
     if (value != (const char *) NULL)
       {
         char
@@ -647,24 +665,32 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
         if (label != (const char *) NULL)
           {
             (void) CloneString(&draw_info->text,label);
+            label=DestroyString(label);
             draw_info->pointsize=1.8*geometry.y;
             (void) FormatLocaleString(offset,MagickPathExtent,"%+g%+g",(double)
               tiles[i].x+geometry.x,(double) tiles[i].height+tiles[i].y+
               geometry.y/2.0);
             (void) CloneString(&draw_info->geometry,offset);
-            (void) AnnotateImage(ashlar_image,draw_info,exception);
+            status=AnnotateImage(ashlar_image,draw_info,exception);
           }
       }
-    if (((ssize_t) tiles[i].width+tiles[i].x) > (ssize_t) extent.width)
-      extent.width=(size_t) ((ssize_t) tiles[i].width+tiles[i].x);
-    if (((ssize_t) tiles[i].height+tiles[i].y+geometry.y+2) > (ssize_t) extent.height)
-      extent.height=(size_t) ((ssize_t) tiles[i].height+tiles[i].y+
-        geometry.y+2);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+    #pragma omp critical
+#endif
+    {
+      if (((ssize_t) tiles[i].width+tiles[i].x) > (ssize_t) extent.width)
+        extent.width=(size_t) ((ssize_t) tiles[i].width+tiles[i].x);
+      if (((ssize_t) tiles[i].height+tiles[i].y+geometry.y+2) > (ssize_t) extent.height)
+        extent.height=(size_t) ((ssize_t) tiles[i].height+tiles[i].y+
+          geometry.y+2);
+    }
     tile_image=DestroyImage(tile_image);
   }
   (void) SetImageExtent(ashlar_image,extent.width,extent.height,exception);
   nodes=(NodeInfo *) RelinquishMagickMemory(nodes);
   tiles=(CanvasInfo *) RelinquishMagickMemory(tiles);
+  if (status == MagickFalse)
+    ashlar_image=DestroyImage(ashlar_image);
   return(ashlar_image);
 }
 
diff --git a/ImageMagick-7.1.2-0/coders/ashlar.h b/ImageMagick-7.1.2-1/coders/ashlar.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ashlar.h
rename to ImageMagick-7.1.2-1/coders/ashlar.h
diff --git a/ImageMagick-7.1.2-0/coders/avs.c b/ImageMagick-7.1.2-1/coders/avs.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/avs.c
rename to ImageMagick-7.1.2-1/coders/avs.c
diff --git a/ImageMagick-7.1.2-0/coders/avs.h b/ImageMagick-7.1.2-1/coders/avs.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/avs.h
rename to ImageMagick-7.1.2-1/coders/avs.h
diff --git a/ImageMagick-7.1.2-0/coders/bayer.c b/ImageMagick-7.1.2-1/coders/bayer.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bayer.c
rename to ImageMagick-7.1.2-1/coders/bayer.c
diff --git a/ImageMagick-7.1.2-0/coders/bayer.h b/ImageMagick-7.1.2-1/coders/bayer.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bayer.h
rename to ImageMagick-7.1.2-1/coders/bayer.h
diff --git a/ImageMagick-7.1.2-0/coders/bgr.c b/ImageMagick-7.1.2-1/coders/bgr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bgr.c
rename to ImageMagick-7.1.2-1/coders/bgr.c
diff --git a/ImageMagick-7.1.2-0/coders/bgr.h b/ImageMagick-7.1.2-1/coders/bgr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bgr.h
rename to ImageMagick-7.1.2-1/coders/bgr.h
diff --git a/ImageMagick-7.1.2-0/coders/bmp.c b/ImageMagick-7.1.2-1/coders/bmp.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bmp.c
rename to ImageMagick-7.1.2-1/coders/bmp.c
diff --git a/ImageMagick-7.1.2-0/coders/bmp.h b/ImageMagick-7.1.2-1/coders/bmp.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bmp.h
rename to ImageMagick-7.1.2-1/coders/bmp.h
diff --git a/ImageMagick-7.1.2-0/coders/braille.c b/ImageMagick-7.1.2-1/coders/braille.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/braille.c
rename to ImageMagick-7.1.2-1/coders/braille.c
diff --git a/ImageMagick-7.1.2-0/coders/braille.h b/ImageMagick-7.1.2-1/coders/braille.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/braille.h
rename to ImageMagick-7.1.2-1/coders/braille.h
diff --git a/ImageMagick-7.1.2-0/coders/bytebuffer-private.h b/ImageMagick-7.1.2-1/coders/bytebuffer-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/bytebuffer-private.h
rename to ImageMagick-7.1.2-1/coders/bytebuffer-private.h
diff --git a/ImageMagick-7.1.2-0/coders/cals.c b/ImageMagick-7.1.2-1/coders/cals.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cals.c
rename to ImageMagick-7.1.2-1/coders/cals.c
diff --git a/ImageMagick-7.1.2-0/coders/cals.h b/ImageMagick-7.1.2-1/coders/cals.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cals.h
rename to ImageMagick-7.1.2-1/coders/cals.h
diff --git a/ImageMagick-7.1.2-0/coders/caption.c b/ImageMagick-7.1.2-1/coders/caption.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/caption.c
rename to ImageMagick-7.1.2-1/coders/caption.c
diff --git a/ImageMagick-7.1.2-0/coders/caption.h b/ImageMagick-7.1.2-1/coders/caption.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/caption.h
rename to ImageMagick-7.1.2-1/coders/caption.h
diff --git a/ImageMagick-7.1.2-0/coders/cin.c b/ImageMagick-7.1.2-1/coders/cin.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cin.c
rename to ImageMagick-7.1.2-1/coders/cin.c
diff --git a/ImageMagick-7.1.2-0/coders/cin.h b/ImageMagick-7.1.2-1/coders/cin.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cin.h
rename to ImageMagick-7.1.2-1/coders/cin.h
diff --git a/ImageMagick-7.1.2-0/coders/cip.c b/ImageMagick-7.1.2-1/coders/cip.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cip.c
rename to ImageMagick-7.1.2-1/coders/cip.c
diff --git a/ImageMagick-7.1.2-0/coders/cip.h b/ImageMagick-7.1.2-1/coders/cip.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cip.h
rename to ImageMagick-7.1.2-1/coders/cip.h
diff --git a/ImageMagick-7.1.2-0/coders/clip.c b/ImageMagick-7.1.2-1/coders/clip.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/clip.c
rename to ImageMagick-7.1.2-1/coders/clip.c
diff --git a/ImageMagick-7.1.2-0/coders/clip.h b/ImageMagick-7.1.2-1/coders/clip.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/clip.h
rename to ImageMagick-7.1.2-1/coders/clip.h
diff --git a/ImageMagick-7.1.2-0/coders/clipboard.c b/ImageMagick-7.1.2-1/coders/clipboard.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/clipboard.c
rename to ImageMagick-7.1.2-1/coders/clipboard.c
diff --git a/ImageMagick-7.1.2-0/coders/clipboard.h b/ImageMagick-7.1.2-1/coders/clipboard.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/clipboard.h
rename to ImageMagick-7.1.2-1/coders/clipboard.h
diff --git a/ImageMagick-7.1.2-0/coders/cmyk.c b/ImageMagick-7.1.2-1/coders/cmyk.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cmyk.c
rename to ImageMagick-7.1.2-1/coders/cmyk.c
diff --git a/ImageMagick-7.1.2-0/coders/cmyk.h b/ImageMagick-7.1.2-1/coders/cmyk.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cmyk.h
rename to ImageMagick-7.1.2-1/coders/cmyk.h
diff --git a/ImageMagick-7.1.2-0/coders/coders-list.h b/ImageMagick-7.1.2-1/coders/coders-list.h
similarity index 99%
rename from ImageMagick-7.1.2-0/coders/coders-list.h
rename to ImageMagick-7.1.2-1/coders/coders-list.h
index 7c7d2dd18..0590527c6 100644
--- a/ImageMagick-7.1.2-0/coders/coders-list.h
+++ b/ImageMagick-7.1.2-1/coders/coders-list.h
@@ -148,6 +148,7 @@ AddMagickCoder(RLE)
 AddMagickCoder(SCR)
 AddMagickCoder(SCREENSHOT)
 AddMagickCoder(SCT)
+AddMagickCoder(SF3)
 AddMagickCoder(SFW)
 AddMagickCoder(SGI)
 AddMagickCoder(SIXEL)
diff --git a/ImageMagick-7.1.2-0/coders/coders-private.h b/ImageMagick-7.1.2-1/coders/coders-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/coders-private.h
rename to ImageMagick-7.1.2-1/coders/coders-private.h
diff --git a/ImageMagick-7.1.2-0/coders/coders.h b/ImageMagick-7.1.2-1/coders/coders.h
similarity index 99%
rename from ImageMagick-7.1.2-0/coders/coders.h
rename to ImageMagick-7.1.2-1/coders/coders.h
index 884cec387..c7aa887c7 100644
--- a/ImageMagick-7.1.2-0/coders/coders.h
+++ b/ImageMagick-7.1.2-1/coders/coders.h
@@ -150,6 +150,7 @@
 #include "coders/scr.h"
 #include "coders/screenshot.h"
 #include "coders/sct.h"
+#include "coders/sf3.h"
 #include "coders/sfw.h"
 #include "coders/sgi.h"
 #include "coders/sixel.h"
diff --git a/ImageMagick-7.1.2-0/coders/cube.c b/ImageMagick-7.1.2-1/coders/cube.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cube.c
rename to ImageMagick-7.1.2-1/coders/cube.c
diff --git a/ImageMagick-7.1.2-0/coders/cube.h b/ImageMagick-7.1.2-1/coders/cube.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cube.h
rename to ImageMagick-7.1.2-1/coders/cube.h
diff --git a/ImageMagick-7.1.2-0/coders/cut.c b/ImageMagick-7.1.2-1/coders/cut.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cut.c
rename to ImageMagick-7.1.2-1/coders/cut.c
diff --git a/ImageMagick-7.1.2-0/coders/cut.h b/ImageMagick-7.1.2-1/coders/cut.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/cut.h
rename to ImageMagick-7.1.2-1/coders/cut.h
diff --git a/ImageMagick-7.1.2-0/coders/dcm.c b/ImageMagick-7.1.2-1/coders/dcm.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dcm.c
rename to ImageMagick-7.1.2-1/coders/dcm.c
diff --git a/ImageMagick-7.1.2-0/coders/dcm.h b/ImageMagick-7.1.2-1/coders/dcm.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dcm.h
rename to ImageMagick-7.1.2-1/coders/dcm.h
diff --git a/ImageMagick-7.1.2-0/coders/dds.c b/ImageMagick-7.1.2-1/coders/dds.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dds.c
rename to ImageMagick-7.1.2-1/coders/dds.c
diff --git a/ImageMagick-7.1.2-0/coders/dds.h b/ImageMagick-7.1.2-1/coders/dds.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dds.h
rename to ImageMagick-7.1.2-1/coders/dds.h
diff --git a/ImageMagick-7.1.2-0/coders/debug.c b/ImageMagick-7.1.2-1/coders/debug.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/debug.c
rename to ImageMagick-7.1.2-1/coders/debug.c
diff --git a/ImageMagick-7.1.2-0/coders/debug.h b/ImageMagick-7.1.2-1/coders/debug.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/debug.h
rename to ImageMagick-7.1.2-1/coders/debug.h
diff --git a/ImageMagick-7.1.2-0/coders/dib.c b/ImageMagick-7.1.2-1/coders/dib.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dib.c
rename to ImageMagick-7.1.2-1/coders/dib.c
diff --git a/ImageMagick-7.1.2-0/coders/dib.h b/ImageMagick-7.1.2-1/coders/dib.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dib.h
rename to ImageMagick-7.1.2-1/coders/dib.h
diff --git a/ImageMagick-7.1.2-0/coders/djvu.c b/ImageMagick-7.1.2-1/coders/djvu.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/djvu.c
rename to ImageMagick-7.1.2-1/coders/djvu.c
diff --git a/ImageMagick-7.1.2-0/coders/djvu.h b/ImageMagick-7.1.2-1/coders/djvu.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/djvu.h
rename to ImageMagick-7.1.2-1/coders/djvu.h
diff --git a/ImageMagick-7.1.2-0/coders/dmr.c b/ImageMagick-7.1.2-1/coders/dmr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dmr.c
rename to ImageMagick-7.1.2-1/coders/dmr.c
diff --git a/ImageMagick-7.1.2-0/coders/dmr.h b/ImageMagick-7.1.2-1/coders/dmr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dmr.h
rename to ImageMagick-7.1.2-1/coders/dmr.h
diff --git a/ImageMagick-7.1.2-0/coders/dng.c b/ImageMagick-7.1.2-1/coders/dng.c
similarity index 99%
rename from ImageMagick-7.1.2-0/coders/dng.c
rename to ImageMagick-7.1.2-1/coders/dng.c
index bf26e1adc..6ab07d093 100644
--- a/ImageMagick-7.1.2-0/coders/dng.c
+++ b/ImageMagick-7.1.2-1/coders/dng.c
@@ -349,7 +349,7 @@ static void LibRawDataError(void *data,const char *magick_unused(file),
       */
       exception=(ExceptionInfo *) data;
       (void) ThrowMagickException(exception,GetMagickModule(),
-        CorruptImageWarning,"Data corrupted at","`%d'",offset);
+        CorruptImageWarning,"Data corrupted at","`%d'",(int) offset);
   }
 }
 
diff --git a/ImageMagick-7.1.2-0/coders/dng.h b/ImageMagick-7.1.2-1/coders/dng.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dng.h
rename to ImageMagick-7.1.2-1/coders/dng.h
diff --git a/ImageMagick-7.1.2-0/coders/dot.c b/ImageMagick-7.1.2-1/coders/dot.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dot.c
rename to ImageMagick-7.1.2-1/coders/dot.c
diff --git a/ImageMagick-7.1.2-0/coders/dot.h b/ImageMagick-7.1.2-1/coders/dot.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dot.h
rename to ImageMagick-7.1.2-1/coders/dot.h
diff --git a/ImageMagick-7.1.2-0/coders/dps.c b/ImageMagick-7.1.2-1/coders/dps.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dps.c
rename to ImageMagick-7.1.2-1/coders/dps.c
diff --git a/ImageMagick-7.1.2-0/coders/dps.h b/ImageMagick-7.1.2-1/coders/dps.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dps.h
rename to ImageMagick-7.1.2-1/coders/dps.h
diff --git a/ImageMagick-7.1.2-0/coders/dpx.c b/ImageMagick-7.1.2-1/coders/dpx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dpx.c
rename to ImageMagick-7.1.2-1/coders/dpx.c
diff --git a/ImageMagick-7.1.2-0/coders/dpx.h b/ImageMagick-7.1.2-1/coders/dpx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/dpx.h
rename to ImageMagick-7.1.2-1/coders/dpx.h
diff --git a/ImageMagick-7.1.2-0/coders/emf.c b/ImageMagick-7.1.2-1/coders/emf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/emf.c
rename to ImageMagick-7.1.2-1/coders/emf.c
diff --git a/ImageMagick-7.1.2-0/coders/emf.h b/ImageMagick-7.1.2-1/coders/emf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/emf.h
rename to ImageMagick-7.1.2-1/coders/emf.h
diff --git a/ImageMagick-7.1.2-0/coders/ept.c b/ImageMagick-7.1.2-1/coders/ept.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ept.c
rename to ImageMagick-7.1.2-1/coders/ept.c
diff --git a/ImageMagick-7.1.2-0/coders/ept.h b/ImageMagick-7.1.2-1/coders/ept.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ept.h
rename to ImageMagick-7.1.2-1/coders/ept.h
diff --git a/ImageMagick-7.1.2-0/coders/exr.c b/ImageMagick-7.1.2-1/coders/exr.c
similarity index 99%
rename from ImageMagick-7.1.2-0/coders/exr.c
rename to ImageMagick-7.1.2-1/coders/exr.c
index 466b94cd5..81c79ae05 100644
--- a/ImageMagick-7.1.2-0/coders/exr.c
+++ b/ImageMagick-7.1.2-1/coders/exr.c
@@ -405,6 +405,10 @@ static MagickBooleanType ReadEXRScanlineImage(exr_context_t ctxt,int part_index,
     Quantum
       *q;
 
+    size_t
+      scans_count_to_read,
+      pixel_count_to_read;
+
     if (y != 0)
       {
         int
@@ -418,11 +422,13 @@ static MagickBooleanType ReadEXRScanlineImage(exr_context_t ctxt,int part_index,
       result=exr_decoding_run(ctxt,part_index,&decoder);
     if (result != EXR_ERR_SUCCESS)
       break;
-    q=QueueAuthenticPixels(image,0,y,image->columns,(size_t) scans_per_chunk,
+    scans_count_to_read=MagickMin((size_t) scans_per_chunk,image->rows-y);
+    pixel_count_to_read=scans_count_to_read*image->columns;
+    q=QueueAuthenticPixels(image,0,y,image->columns,scans_count_to_read,
       exception);
     if (q == (Quantum *) NULL)
       break;
-    status=ReadEXRPixels(image,decoder,pixel_channels,data,q,pixel_count,
+    status=ReadEXRPixels(image,decoder,pixel_channels,data,q,pixel_count_to_read,
       image->columns,0,exception);
     if (status == MagickFalse)
       break;
diff --git a/ImageMagick-7.1.2-0/coders/exr.h b/ImageMagick-7.1.2-1/coders/exr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/exr.h
rename to ImageMagick-7.1.2-1/coders/exr.h
diff --git a/ImageMagick-7.1.2-0/coders/farbfeld.c b/ImageMagick-7.1.2-1/coders/farbfeld.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/farbfeld.c
rename to ImageMagick-7.1.2-1/coders/farbfeld.c
diff --git a/ImageMagick-7.1.2-0/coders/farbfeld.h b/ImageMagick-7.1.2-1/coders/farbfeld.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/farbfeld.h
rename to ImageMagick-7.1.2-1/coders/farbfeld.h
diff --git a/ImageMagick-7.1.2-0/coders/fax.c b/ImageMagick-7.1.2-1/coders/fax.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fax.c
rename to ImageMagick-7.1.2-1/coders/fax.c
diff --git a/ImageMagick-7.1.2-0/coders/fax.h b/ImageMagick-7.1.2-1/coders/fax.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fax.h
rename to ImageMagick-7.1.2-1/coders/fax.h
diff --git a/ImageMagick-7.1.2-0/coders/fits.c b/ImageMagick-7.1.2-1/coders/fits.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fits.c
rename to ImageMagick-7.1.2-1/coders/fits.c
diff --git a/ImageMagick-7.1.2-0/coders/fits.h b/ImageMagick-7.1.2-1/coders/fits.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fits.h
rename to ImageMagick-7.1.2-1/coders/fits.h
diff --git a/ImageMagick-7.1.2-0/coders/fl32.c b/ImageMagick-7.1.2-1/coders/fl32.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fl32.c
rename to ImageMagick-7.1.2-1/coders/fl32.c
diff --git a/ImageMagick-7.1.2-0/coders/fl32.h b/ImageMagick-7.1.2-1/coders/fl32.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fl32.h
rename to ImageMagick-7.1.2-1/coders/fl32.h
diff --git a/ImageMagick-7.1.2-0/coders/flif.c b/ImageMagick-7.1.2-1/coders/flif.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/flif.c
rename to ImageMagick-7.1.2-1/coders/flif.c
diff --git a/ImageMagick-7.1.2-0/coders/flif.h b/ImageMagick-7.1.2-1/coders/flif.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/flif.h
rename to ImageMagick-7.1.2-1/coders/flif.h
diff --git a/ImageMagick-7.1.2-0/coders/fpx.c b/ImageMagick-7.1.2-1/coders/fpx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fpx.c
rename to ImageMagick-7.1.2-1/coders/fpx.c
diff --git a/ImageMagick-7.1.2-0/coders/fpx.h b/ImageMagick-7.1.2-1/coders/fpx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/fpx.h
rename to ImageMagick-7.1.2-1/coders/fpx.h
diff --git a/ImageMagick-7.1.2-0/coders/ftxt.c b/ImageMagick-7.1.2-1/coders/ftxt.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ftxt.c
rename to ImageMagick-7.1.2-1/coders/ftxt.c
diff --git a/ImageMagick-7.1.2-0/coders/ftxt.h b/ImageMagick-7.1.2-1/coders/ftxt.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ftxt.h
rename to ImageMagick-7.1.2-1/coders/ftxt.h
diff --git a/ImageMagick-7.1.2-0/coders/ghostscript-private.h b/ImageMagick-7.1.2-1/coders/ghostscript-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ghostscript-private.h
rename to ImageMagick-7.1.2-1/coders/ghostscript-private.h
diff --git a/ImageMagick-7.1.2-0/coders/gif.c b/ImageMagick-7.1.2-1/coders/gif.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gif.c
rename to ImageMagick-7.1.2-1/coders/gif.c
diff --git a/ImageMagick-7.1.2-0/coders/gif.h b/ImageMagick-7.1.2-1/coders/gif.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gif.h
rename to ImageMagick-7.1.2-1/coders/gif.h
diff --git a/ImageMagick-7.1.2-0/coders/gradient.c b/ImageMagick-7.1.2-1/coders/gradient.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gradient.c
rename to ImageMagick-7.1.2-1/coders/gradient.c
diff --git a/ImageMagick-7.1.2-0/coders/gradient.h b/ImageMagick-7.1.2-1/coders/gradient.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gradient.h
rename to ImageMagick-7.1.2-1/coders/gradient.h
diff --git a/ImageMagick-7.1.2-0/coders/gray.c b/ImageMagick-7.1.2-1/coders/gray.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gray.c
rename to ImageMagick-7.1.2-1/coders/gray.c
diff --git a/ImageMagick-7.1.2-0/coders/gray.h b/ImageMagick-7.1.2-1/coders/gray.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/gray.h
rename to ImageMagick-7.1.2-1/coders/gray.h
diff --git a/ImageMagick-7.1.2-0/coders/hald.c b/ImageMagick-7.1.2-1/coders/hald.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hald.c
rename to ImageMagick-7.1.2-1/coders/hald.c
diff --git a/ImageMagick-7.1.2-0/coders/hald.h b/ImageMagick-7.1.2-1/coders/hald.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hald.h
rename to ImageMagick-7.1.2-1/coders/hald.h
diff --git a/ImageMagick-7.1.2-0/coders/hdr.c b/ImageMagick-7.1.2-1/coders/hdr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hdr.c
rename to ImageMagick-7.1.2-1/coders/hdr.c
diff --git a/ImageMagick-7.1.2-0/coders/hdr.h b/ImageMagick-7.1.2-1/coders/hdr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hdr.h
rename to ImageMagick-7.1.2-1/coders/hdr.h
diff --git a/ImageMagick-7.1.2-0/coders/heic.c b/ImageMagick-7.1.2-1/coders/heic.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/heic.c
rename to ImageMagick-7.1.2-1/coders/heic.c
diff --git a/ImageMagick-7.1.2-0/coders/heic.h b/ImageMagick-7.1.2-1/coders/heic.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/heic.h
rename to ImageMagick-7.1.2-1/coders/heic.h
diff --git a/ImageMagick-7.1.2-0/coders/histogram.c b/ImageMagick-7.1.2-1/coders/histogram.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/histogram.c
rename to ImageMagick-7.1.2-1/coders/histogram.c
diff --git a/ImageMagick-7.1.2-0/coders/histogram.h b/ImageMagick-7.1.2-1/coders/histogram.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/histogram.h
rename to ImageMagick-7.1.2-1/coders/histogram.h
diff --git a/ImageMagick-7.1.2-0/coders/hrz.c b/ImageMagick-7.1.2-1/coders/hrz.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hrz.c
rename to ImageMagick-7.1.2-1/coders/hrz.c
diff --git a/ImageMagick-7.1.2-0/coders/hrz.h b/ImageMagick-7.1.2-1/coders/hrz.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/hrz.h
rename to ImageMagick-7.1.2-1/coders/hrz.h
diff --git a/ImageMagick-7.1.2-0/coders/html.c b/ImageMagick-7.1.2-1/coders/html.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/html.c
rename to ImageMagick-7.1.2-1/coders/html.c
diff --git a/ImageMagick-7.1.2-0/coders/html.h b/ImageMagick-7.1.2-1/coders/html.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/html.h
rename to ImageMagick-7.1.2-1/coders/html.h
diff --git a/ImageMagick-7.1.2-0/coders/icon.c b/ImageMagick-7.1.2-1/coders/icon.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/icon.c
rename to ImageMagick-7.1.2-1/coders/icon.c
diff --git a/ImageMagick-7.1.2-0/coders/icon.h b/ImageMagick-7.1.2-1/coders/icon.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/icon.h
rename to ImageMagick-7.1.2-1/coders/icon.h
diff --git a/ImageMagick-7.1.2-0/coders/info.c b/ImageMagick-7.1.2-1/coders/info.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/info.c
rename to ImageMagick-7.1.2-1/coders/info.c
diff --git a/ImageMagick-7.1.2-0/coders/info.h b/ImageMagick-7.1.2-1/coders/info.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/info.h
rename to ImageMagick-7.1.2-1/coders/info.h
diff --git a/ImageMagick-7.1.2-0/coders/inline.c b/ImageMagick-7.1.2-1/coders/inline.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/inline.c
rename to ImageMagick-7.1.2-1/coders/inline.c
diff --git a/ImageMagick-7.1.2-0/coders/inline.h b/ImageMagick-7.1.2-1/coders/inline.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/inline.h
rename to ImageMagick-7.1.2-1/coders/inline.h
diff --git a/ImageMagick-7.1.2-0/coders/ipl.c b/ImageMagick-7.1.2-1/coders/ipl.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ipl.c
rename to ImageMagick-7.1.2-1/coders/ipl.c
diff --git a/ImageMagick-7.1.2-0/coders/ipl.h b/ImageMagick-7.1.2-1/coders/ipl.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ipl.h
rename to ImageMagick-7.1.2-1/coders/ipl.h
diff --git a/ImageMagick-7.1.2-0/coders/jbig.c b/ImageMagick-7.1.2-1/coders/jbig.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jbig.c
rename to ImageMagick-7.1.2-1/coders/jbig.c
diff --git a/ImageMagick-7.1.2-0/coders/jbig.h b/ImageMagick-7.1.2-1/coders/jbig.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jbig.h
rename to ImageMagick-7.1.2-1/coders/jbig.h
diff --git a/ImageMagick-7.1.2-0/coders/jnx.c b/ImageMagick-7.1.2-1/coders/jnx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jnx.c
rename to ImageMagick-7.1.2-1/coders/jnx.c
diff --git a/ImageMagick-7.1.2-0/coders/jnx.h b/ImageMagick-7.1.2-1/coders/jnx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jnx.h
rename to ImageMagick-7.1.2-1/coders/jnx.h
diff --git a/ImageMagick-7.1.2-0/coders/jp2.c b/ImageMagick-7.1.2-1/coders/jp2.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jp2.c
rename to ImageMagick-7.1.2-1/coders/jp2.c
diff --git a/ImageMagick-7.1.2-0/coders/jp2.h b/ImageMagick-7.1.2-1/coders/jp2.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jp2.h
rename to ImageMagick-7.1.2-1/coders/jp2.h
diff --git a/ImageMagick-7.1.2-0/coders/jpeg.c b/ImageMagick-7.1.2-1/coders/jpeg.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jpeg.c
rename to ImageMagick-7.1.2-1/coders/jpeg.c
diff --git a/ImageMagick-7.1.2-0/coders/jpeg.h b/ImageMagick-7.1.2-1/coders/jpeg.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jpeg.h
rename to ImageMagick-7.1.2-1/coders/jpeg.h
diff --git a/ImageMagick-7.1.2-0/coders/json.c b/ImageMagick-7.1.2-1/coders/json.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/json.c
rename to ImageMagick-7.1.2-1/coders/json.c
diff --git a/ImageMagick-7.1.2-0/coders/json.h b/ImageMagick-7.1.2-1/coders/json.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/json.h
rename to ImageMagick-7.1.2-1/coders/json.h
diff --git a/ImageMagick-7.1.2-0/coders/jxl.c b/ImageMagick-7.1.2-1/coders/jxl.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jxl.c
rename to ImageMagick-7.1.2-1/coders/jxl.c
diff --git a/ImageMagick-7.1.2-0/coders/jxl.h b/ImageMagick-7.1.2-1/coders/jxl.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/jxl.h
rename to ImageMagick-7.1.2-1/coders/jxl.h
diff --git a/ImageMagick-7.1.2-0/coders/kernel.c b/ImageMagick-7.1.2-1/coders/kernel.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/kernel.c
rename to ImageMagick-7.1.2-1/coders/kernel.c
diff --git a/ImageMagick-7.1.2-0/coders/kernel.h b/ImageMagick-7.1.2-1/coders/kernel.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/kernel.h
rename to ImageMagick-7.1.2-1/coders/kernel.h
diff --git a/ImageMagick-7.1.2-0/coders/label.c b/ImageMagick-7.1.2-1/coders/label.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/label.c
rename to ImageMagick-7.1.2-1/coders/label.c
diff --git a/ImageMagick-7.1.2-0/coders/label.h b/ImageMagick-7.1.2-1/coders/label.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/label.h
rename to ImageMagick-7.1.2-1/coders/label.h
diff --git a/ImageMagick-7.1.2-0/coders/mac.c b/ImageMagick-7.1.2-1/coders/mac.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mac.c
rename to ImageMagick-7.1.2-1/coders/mac.c
diff --git a/ImageMagick-7.1.2-0/coders/mac.h b/ImageMagick-7.1.2-1/coders/mac.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mac.h
rename to ImageMagick-7.1.2-1/coders/mac.h
diff --git a/ImageMagick-7.1.2-0/coders/magick.c b/ImageMagick-7.1.2-1/coders/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/magick.c
rename to ImageMagick-7.1.2-1/coders/magick.c
diff --git a/ImageMagick-7.1.2-0/coders/magick.h b/ImageMagick-7.1.2-1/coders/magick.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/magick.h
rename to ImageMagick-7.1.2-1/coders/magick.h
diff --git a/ImageMagick-7.1.2-0/coders/map.c b/ImageMagick-7.1.2-1/coders/map.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/map.c
rename to ImageMagick-7.1.2-1/coders/map.c
diff --git a/ImageMagick-7.1.2-0/coders/map.h b/ImageMagick-7.1.2-1/coders/map.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/map.h
rename to ImageMagick-7.1.2-1/coders/map.h
diff --git a/ImageMagick-7.1.2-0/coders/mask.c b/ImageMagick-7.1.2-1/coders/mask.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mask.c
rename to ImageMagick-7.1.2-1/coders/mask.c
diff --git a/ImageMagick-7.1.2-0/coders/mask.h b/ImageMagick-7.1.2-1/coders/mask.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mask.h
rename to ImageMagick-7.1.2-1/coders/mask.h
diff --git a/ImageMagick-7.1.2-0/coders/mat.c b/ImageMagick-7.1.2-1/coders/mat.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mat.c
rename to ImageMagick-7.1.2-1/coders/mat.c
diff --git a/ImageMagick-7.1.2-0/coders/mat.h b/ImageMagick-7.1.2-1/coders/mat.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mat.h
rename to ImageMagick-7.1.2-1/coders/mat.h
diff --git a/ImageMagick-7.1.2-0/coders/matte.c b/ImageMagick-7.1.2-1/coders/matte.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/matte.c
rename to ImageMagick-7.1.2-1/coders/matte.c
diff --git a/ImageMagick-7.1.2-0/coders/matte.h b/ImageMagick-7.1.2-1/coders/matte.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/matte.h
rename to ImageMagick-7.1.2-1/coders/matte.h
diff --git a/ImageMagick-7.1.2-0/coders/meta.c b/ImageMagick-7.1.2-1/coders/meta.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/meta.c
rename to ImageMagick-7.1.2-1/coders/meta.c
diff --git a/ImageMagick-7.1.2-0/coders/meta.h b/ImageMagick-7.1.2-1/coders/meta.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/meta.h
rename to ImageMagick-7.1.2-1/coders/meta.h
diff --git a/ImageMagick-7.1.2-0/coders/miff.c b/ImageMagick-7.1.2-1/coders/miff.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/miff.c
rename to ImageMagick-7.1.2-1/coders/miff.c
diff --git a/ImageMagick-7.1.2-0/coders/miff.h b/ImageMagick-7.1.2-1/coders/miff.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/miff.h
rename to ImageMagick-7.1.2-1/coders/miff.h
diff --git a/ImageMagick-7.1.2-0/coders/mono.c b/ImageMagick-7.1.2-1/coders/mono.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mono.c
rename to ImageMagick-7.1.2-1/coders/mono.c
diff --git a/ImageMagick-7.1.2-0/coders/mono.h b/ImageMagick-7.1.2-1/coders/mono.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mono.h
rename to ImageMagick-7.1.2-1/coders/mono.h
diff --git a/ImageMagick-7.1.2-0/coders/mpc.c b/ImageMagick-7.1.2-1/coders/mpc.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mpc.c
rename to ImageMagick-7.1.2-1/coders/mpc.c
diff --git a/ImageMagick-7.1.2-0/coders/mpc.h b/ImageMagick-7.1.2-1/coders/mpc.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mpc.h
rename to ImageMagick-7.1.2-1/coders/mpc.h
diff --git a/ImageMagick-7.1.2-0/coders/mpr.c b/ImageMagick-7.1.2-1/coders/mpr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mpr.c
rename to ImageMagick-7.1.2-1/coders/mpr.c
diff --git a/ImageMagick-7.1.2-0/coders/mpr.h b/ImageMagick-7.1.2-1/coders/mpr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mpr.h
rename to ImageMagick-7.1.2-1/coders/mpr.h
diff --git a/ImageMagick-7.1.2-0/coders/msl.c b/ImageMagick-7.1.2-1/coders/msl.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/msl.c
rename to ImageMagick-7.1.2-1/coders/msl.c
diff --git a/ImageMagick-7.1.2-0/coders/msl.h b/ImageMagick-7.1.2-1/coders/msl.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/msl.h
rename to ImageMagick-7.1.2-1/coders/msl.h
diff --git a/ImageMagick-7.1.2-0/coders/mtv.c b/ImageMagick-7.1.2-1/coders/mtv.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mtv.c
rename to ImageMagick-7.1.2-1/coders/mtv.c
diff --git a/ImageMagick-7.1.2-0/coders/mtv.h b/ImageMagick-7.1.2-1/coders/mtv.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mtv.h
rename to ImageMagick-7.1.2-1/coders/mtv.h
diff --git a/ImageMagick-7.1.2-0/coders/mvg.c b/ImageMagick-7.1.2-1/coders/mvg.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mvg.c
rename to ImageMagick-7.1.2-1/coders/mvg.c
diff --git a/ImageMagick-7.1.2-0/coders/mvg.h b/ImageMagick-7.1.2-1/coders/mvg.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/mvg.h
rename to ImageMagick-7.1.2-1/coders/mvg.h
diff --git a/ImageMagick-7.1.2-0/coders/null.c b/ImageMagick-7.1.2-1/coders/null.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/null.c
rename to ImageMagick-7.1.2-1/coders/null.c
diff --git a/ImageMagick-7.1.2-0/coders/null.h b/ImageMagick-7.1.2-1/coders/null.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/null.h
rename to ImageMagick-7.1.2-1/coders/null.h
diff --git a/ImageMagick-7.1.2-0/coders/ora.c b/ImageMagick-7.1.2-1/coders/ora.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ora.c
rename to ImageMagick-7.1.2-1/coders/ora.c
diff --git a/ImageMagick-7.1.2-0/coders/ora.h b/ImageMagick-7.1.2-1/coders/ora.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ora.h
rename to ImageMagick-7.1.2-1/coders/ora.h
diff --git a/ImageMagick-7.1.2-0/coders/otb.c b/ImageMagick-7.1.2-1/coders/otb.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/otb.c
rename to ImageMagick-7.1.2-1/coders/otb.c
diff --git a/ImageMagick-7.1.2-0/coders/otb.h b/ImageMagick-7.1.2-1/coders/otb.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/otb.h
rename to ImageMagick-7.1.2-1/coders/otb.h
diff --git a/ImageMagick-7.1.2-0/coders/palm.c b/ImageMagick-7.1.2-1/coders/palm.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/palm.c
rename to ImageMagick-7.1.2-1/coders/palm.c
diff --git a/ImageMagick-7.1.2-0/coders/palm.h b/ImageMagick-7.1.2-1/coders/palm.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/palm.h
rename to ImageMagick-7.1.2-1/coders/palm.h
diff --git a/ImageMagick-7.1.2-0/coders/pango.c b/ImageMagick-7.1.2-1/coders/pango.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pango.c
rename to ImageMagick-7.1.2-1/coders/pango.c
diff --git a/ImageMagick-7.1.2-0/coders/pango.h b/ImageMagick-7.1.2-1/coders/pango.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pango.h
rename to ImageMagick-7.1.2-1/coders/pango.h
diff --git a/ImageMagick-7.1.2-0/coders/pattern.c b/ImageMagick-7.1.2-1/coders/pattern.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pattern.c
rename to ImageMagick-7.1.2-1/coders/pattern.c
diff --git a/ImageMagick-7.1.2-0/coders/pattern.h b/ImageMagick-7.1.2-1/coders/pattern.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pattern.h
rename to ImageMagick-7.1.2-1/coders/pattern.h
diff --git a/ImageMagick-7.1.2-0/coders/pcd.c b/ImageMagick-7.1.2-1/coders/pcd.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcd.c
rename to ImageMagick-7.1.2-1/coders/pcd.c
diff --git a/ImageMagick-7.1.2-0/coders/pcd.h b/ImageMagick-7.1.2-1/coders/pcd.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcd.h
rename to ImageMagick-7.1.2-1/coders/pcd.h
diff --git a/ImageMagick-7.1.2-0/coders/pcl.c b/ImageMagick-7.1.2-1/coders/pcl.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcl.c
rename to ImageMagick-7.1.2-1/coders/pcl.c
diff --git a/ImageMagick-7.1.2-0/coders/pcl.h b/ImageMagick-7.1.2-1/coders/pcl.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcl.h
rename to ImageMagick-7.1.2-1/coders/pcl.h
diff --git a/ImageMagick-7.1.2-0/coders/pcx.c b/ImageMagick-7.1.2-1/coders/pcx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcx.c
rename to ImageMagick-7.1.2-1/coders/pcx.c
diff --git a/ImageMagick-7.1.2-0/coders/pcx.h b/ImageMagick-7.1.2-1/coders/pcx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pcx.h
rename to ImageMagick-7.1.2-1/coders/pcx.h
diff --git a/ImageMagick-7.1.2-0/coders/pdb.c b/ImageMagick-7.1.2-1/coders/pdb.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pdb.c
rename to ImageMagick-7.1.2-1/coders/pdb.c
diff --git a/ImageMagick-7.1.2-0/coders/pdb.h b/ImageMagick-7.1.2-1/coders/pdb.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pdb.h
rename to ImageMagick-7.1.2-1/coders/pdb.h
diff --git a/ImageMagick-7.1.2-0/coders/pdf.c b/ImageMagick-7.1.2-1/coders/pdf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pdf.c
rename to ImageMagick-7.1.2-1/coders/pdf.c
diff --git a/ImageMagick-7.1.2-0/coders/pdf.h b/ImageMagick-7.1.2-1/coders/pdf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pdf.h
rename to ImageMagick-7.1.2-1/coders/pdf.h
diff --git a/ImageMagick-7.1.2-0/coders/pes.c b/ImageMagick-7.1.2-1/coders/pes.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pes.c
rename to ImageMagick-7.1.2-1/coders/pes.c
diff --git a/ImageMagick-7.1.2-0/coders/pes.h b/ImageMagick-7.1.2-1/coders/pes.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pes.h
rename to ImageMagick-7.1.2-1/coders/pes.h
diff --git a/ImageMagick-7.1.2-0/coders/pgx.c b/ImageMagick-7.1.2-1/coders/pgx.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pgx.c
rename to ImageMagick-7.1.2-1/coders/pgx.c
diff --git a/ImageMagick-7.1.2-0/coders/pgx.h b/ImageMagick-7.1.2-1/coders/pgx.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pgx.h
rename to ImageMagick-7.1.2-1/coders/pgx.h
diff --git a/ImageMagick-7.1.2-0/coders/pict.c b/ImageMagick-7.1.2-1/coders/pict.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pict.c
rename to ImageMagick-7.1.2-1/coders/pict.c
diff --git a/ImageMagick-7.1.2-0/coders/pict.h b/ImageMagick-7.1.2-1/coders/pict.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pict.h
rename to ImageMagick-7.1.2-1/coders/pict.h
diff --git a/ImageMagick-7.1.2-0/coders/pix.c b/ImageMagick-7.1.2-1/coders/pix.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pix.c
rename to ImageMagick-7.1.2-1/coders/pix.c
diff --git a/ImageMagick-7.1.2-0/coders/pix.h b/ImageMagick-7.1.2-1/coders/pix.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pix.h
rename to ImageMagick-7.1.2-1/coders/pix.h
diff --git a/ImageMagick-7.1.2-0/coders/plasma.c b/ImageMagick-7.1.2-1/coders/plasma.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/plasma.c
rename to ImageMagick-7.1.2-1/coders/plasma.c
diff --git a/ImageMagick-7.1.2-0/coders/plasma.h b/ImageMagick-7.1.2-1/coders/plasma.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/plasma.h
rename to ImageMagick-7.1.2-1/coders/plasma.h
diff --git a/ImageMagick-7.1.2-0/coders/png.c b/ImageMagick-7.1.2-1/coders/png.c
similarity index 99%
rename from ImageMagick-7.1.2-0/coders/png.c
rename to ImageMagick-7.1.2-1/coders/png.c
index 5f3d33a42..4988261d5 100644
--- a/ImageMagick-7.1.2-0/coders/png.c
+++ b/ImageMagick-7.1.2-1/coders/png.c
@@ -4791,37 +4791,24 @@ static Image *ReadOneJNGImage(MngReadInfo *mng_info,
       jng_image=ReadImage(alpha_image_info,exception);
 
       if (jng_image != (Image *) NULL)
-        for (y=0; y < (ssize_t) image->rows; y++)
         {
-          s=GetVirtualPixels(jng_image,0,y,image->columns,1,exception);
-          q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-          if ((s == (const Quantum *)  NULL) || (q == (Quantum *) NULL))
-            break;
+          image->alpha_trait=BlendPixelTrait;
+          for (y=0; y < (ssize_t) image->rows; y++)
+          {
+            s=GetVirtualPixels(jng_image,0,y,image->columns,1,exception);
+            q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
+            if ((s == (const Quantum *)  NULL) || (q == (Quantum *) NULL))
+              break;
 
-          if (image->alpha_trait != UndefinedPixelTrait)
             for (x=(ssize_t) image->columns; x != 0; x--)
             {
               SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
               q+=(ptrdiff_t) GetPixelChannels(image);
               s+=(ptrdiff_t) GetPixelChannels(jng_image);
             }
-
-          else
-            for (x=(ssize_t) image->columns; x != 0; x--)
-            {
-              Quantum
-                alpha;
-
-              alpha=GetPixelRed(jng_image,s);
-              SetPixelAlpha(image,alpha,q);
-              if (alpha != OpaqueAlpha)
-                image->alpha_trait=BlendPixelTrait;
-              q+=(ptrdiff_t) GetPixelChannels(image);
-              s+=(ptrdiff_t) GetPixelChannels(jng_image);
-            }
-
-          if (SyncAuthenticPixels(image,exception) == MagickFalse)
-            break;
+            if (SyncAuthenticPixels(image,exception) == MagickFalse)
+              break;
+          }
         }
       (void) RelinquishUniqueFileResource(alpha_image->filename);
       alpha_image=DestroyImageList(alpha_image);
@@ -6403,7 +6390,7 @@ static Image *ReadOneMNGImage(MngReadInfo* mng_info,
         if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
             ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
           {
-            png_uint_32
+            size_t
                magnified_height,
                magnified_width;
 
@@ -6417,19 +6404,19 @@ static Image *ReadOneMNGImage(MngReadInfo* mng_info,
               mng_info->magn_methy = 1;
             if (mng_info->magn_methx == 1)
               {
-                magnified_width=mng_info->magn_ml;
+                magnified_width=(size_t) mng_info->magn_ml;
 
                 if (image->columns > 1)
                    magnified_width += mng_info->magn_mr;
 
                 if (image->columns > 2)
-                   magnified_width += (png_uint_32)
+                   magnified_width += (size_t)
                       ((image->columns-2)*(mng_info->magn_mx));
               }
 
             else
               {
-                magnified_width=(png_uint_32) image->columns;
+                magnified_width=(size_t) image->columns;
 
                 if (image->columns > 1)
                    magnified_width += mng_info->magn_ml-1;
@@ -6438,25 +6425,25 @@ static Image *ReadOneMNGImage(MngReadInfo* mng_info,
                    magnified_width += mng_info->magn_mr-1;
 
                 if (image->columns > 3)
-                   magnified_width += (png_uint_32)
+                   magnified_width += (size_t)
                       ((image->columns-3)*(mng_info->magn_mx-1));
               }
 
             if (mng_info->magn_methy == 1)
               {
-                magnified_height=mng_info->magn_mt;
+                magnified_height=(size_t) mng_info->magn_mt;
 
                 if (image->rows > 1)
                    magnified_height += mng_info->magn_mb;
 
                 if (image->rows > 2)
-                   magnified_height += (png_uint_32)
+                   magnified_height += (size_t)
                       ((image->rows-2)*(mng_info->magn_my));
               }
 
             else
               {
-                magnified_height=(png_uint_32) image->rows;
+                magnified_height=(size_t) image->rows;
 
                 if (image->rows > 1)
                    magnified_height += mng_info->magn_mt-1;
@@ -6465,7 +6452,7 @@ static Image *ReadOneMNGImage(MngReadInfo* mng_info,
                    magnified_height += mng_info->magn_mb-1;
 
                 if (image->rows > 3)
-                   magnified_height += (png_uint_32)
+                   magnified_height += (size_t)
                       ((image->rows-3)*(mng_info->magn_my-1));
               }
 
diff --git a/ImageMagick-7.1.2-0/coders/png.h b/ImageMagick-7.1.2-1/coders/png.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/png.h
rename to ImageMagick-7.1.2-1/coders/png.h
diff --git a/ImageMagick-7.1.2-0/coders/pnm.c b/ImageMagick-7.1.2-1/coders/pnm.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pnm.c
rename to ImageMagick-7.1.2-1/coders/pnm.c
diff --git a/ImageMagick-7.1.2-0/coders/pnm.h b/ImageMagick-7.1.2-1/coders/pnm.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pnm.h
rename to ImageMagick-7.1.2-1/coders/pnm.h
diff --git a/ImageMagick-7.1.2-0/coders/ps.c b/ImageMagick-7.1.2-1/coders/ps.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps.c
rename to ImageMagick-7.1.2-1/coders/ps.c
diff --git a/ImageMagick-7.1.2-0/coders/ps.h b/ImageMagick-7.1.2-1/coders/ps.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps.h
rename to ImageMagick-7.1.2-1/coders/ps.h
diff --git a/ImageMagick-7.1.2-0/coders/ps2.c b/ImageMagick-7.1.2-1/coders/ps2.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps2.c
rename to ImageMagick-7.1.2-1/coders/ps2.c
diff --git a/ImageMagick-7.1.2-0/coders/ps2.h b/ImageMagick-7.1.2-1/coders/ps2.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps2.h
rename to ImageMagick-7.1.2-1/coders/ps2.h
diff --git a/ImageMagick-7.1.2-0/coders/ps3.c b/ImageMagick-7.1.2-1/coders/ps3.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps3.c
rename to ImageMagick-7.1.2-1/coders/ps3.c
diff --git a/ImageMagick-7.1.2-0/coders/ps3.h b/ImageMagick-7.1.2-1/coders/ps3.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ps3.h
rename to ImageMagick-7.1.2-1/coders/ps3.h
diff --git a/ImageMagick-7.1.2-0/coders/psd-private.h b/ImageMagick-7.1.2-1/coders/psd-private.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/psd-private.h
rename to ImageMagick-7.1.2-1/coders/psd-private.h
diff --git a/ImageMagick-7.1.2-0/coders/psd.c b/ImageMagick-7.1.2-1/coders/psd.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/psd.c
rename to ImageMagick-7.1.2-1/coders/psd.c
diff --git a/ImageMagick-7.1.2-0/coders/psd.h b/ImageMagick-7.1.2-1/coders/psd.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/psd.h
rename to ImageMagick-7.1.2-1/coders/psd.h
diff --git a/ImageMagick-7.1.2-0/coders/pwp.c b/ImageMagick-7.1.2-1/coders/pwp.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pwp.c
rename to ImageMagick-7.1.2-1/coders/pwp.c
diff --git a/ImageMagick-7.1.2-0/coders/pwp.h b/ImageMagick-7.1.2-1/coders/pwp.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/pwp.h
rename to ImageMagick-7.1.2-1/coders/pwp.h
diff --git a/ImageMagick-7.1.2-0/coders/qoi.c b/ImageMagick-7.1.2-1/coders/qoi.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/qoi.c
rename to ImageMagick-7.1.2-1/coders/qoi.c
diff --git a/ImageMagick-7.1.2-0/coders/qoi.h b/ImageMagick-7.1.2-1/coders/qoi.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/qoi.h
rename to ImageMagick-7.1.2-1/coders/qoi.h
diff --git a/ImageMagick-7.1.2-0/coders/raw.c b/ImageMagick-7.1.2-1/coders/raw.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/raw.c
rename to ImageMagick-7.1.2-1/coders/raw.c
diff --git a/ImageMagick-7.1.2-0/coders/raw.h b/ImageMagick-7.1.2-1/coders/raw.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/raw.h
rename to ImageMagick-7.1.2-1/coders/raw.h
diff --git a/ImageMagick-7.1.2-0/coders/rgb.c b/ImageMagick-7.1.2-1/coders/rgb.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rgb.c
rename to ImageMagick-7.1.2-1/coders/rgb.c
diff --git a/ImageMagick-7.1.2-0/coders/rgb.h b/ImageMagick-7.1.2-1/coders/rgb.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rgb.h
rename to ImageMagick-7.1.2-1/coders/rgb.h
diff --git a/ImageMagick-7.1.2-0/coders/rgf.c b/ImageMagick-7.1.2-1/coders/rgf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rgf.c
rename to ImageMagick-7.1.2-1/coders/rgf.c
diff --git a/ImageMagick-7.1.2-0/coders/rgf.h b/ImageMagick-7.1.2-1/coders/rgf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rgf.h
rename to ImageMagick-7.1.2-1/coders/rgf.h
diff --git a/ImageMagick-7.1.2-0/coders/rla.c b/ImageMagick-7.1.2-1/coders/rla.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rla.c
rename to ImageMagick-7.1.2-1/coders/rla.c
diff --git a/ImageMagick-7.1.2-0/coders/rla.h b/ImageMagick-7.1.2-1/coders/rla.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rla.h
rename to ImageMagick-7.1.2-1/coders/rla.h
diff --git a/ImageMagick-7.1.2-0/coders/rle.c b/ImageMagick-7.1.2-1/coders/rle.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rle.c
rename to ImageMagick-7.1.2-1/coders/rle.c
diff --git a/ImageMagick-7.1.2-0/coders/rle.h b/ImageMagick-7.1.2-1/coders/rle.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/rle.h
rename to ImageMagick-7.1.2-1/coders/rle.h
diff --git a/ImageMagick-7.1.2-0/coders/scr.c b/ImageMagick-7.1.2-1/coders/scr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/scr.c
rename to ImageMagick-7.1.2-1/coders/scr.c
diff --git a/ImageMagick-7.1.2-0/coders/scr.h b/ImageMagick-7.1.2-1/coders/scr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/scr.h
rename to ImageMagick-7.1.2-1/coders/scr.h
diff --git a/ImageMagick-7.1.2-0/coders/screenshot.c b/ImageMagick-7.1.2-1/coders/screenshot.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/screenshot.c
rename to ImageMagick-7.1.2-1/coders/screenshot.c
diff --git a/ImageMagick-7.1.2-0/coders/screenshot.h b/ImageMagick-7.1.2-1/coders/screenshot.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/screenshot.h
rename to ImageMagick-7.1.2-1/coders/screenshot.h
diff --git a/ImageMagick-7.1.2-0/coders/sct.c b/ImageMagick-7.1.2-1/coders/sct.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sct.c
rename to ImageMagick-7.1.2-1/coders/sct.c
diff --git a/ImageMagick-7.1.2-0/coders/sct.h b/ImageMagick-7.1.2-1/coders/sct.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sct.h
rename to ImageMagick-7.1.2-1/coders/sct.h
diff --git a/ImageMagick-7.1.2-1/coders/sf3.c b/ImageMagick-7.1.2-1/coders/sf3.c
new file mode 100644
index 000000000..4e8232810
--- /dev/null
+++ b/ImageMagick-7.1.2-1/coders/sf3.c
@@ -0,0 +1,773 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                            SSSSS  FFFFF  3333                               %
+%                            S      F          3                              %
+%                            SSSSS  FFF      33                               %
+%                                S  F          3                              %
+%                            SSSSS  F      3333                               %
+%                                                                             %
+%                                                                             %
+%                         Simple File Format Family                           %
+%                                                                             %
+%                              Software Design                                %
+%                               Yukari Hafner                                 %
+%                                 July 2025                                   %
+%                                                                             %
+%                                                                             %
+%  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  %
+%  obtain a copy of the License at                                            %
+%                                                                             %
+%    https://imagemagick.org/script/license.php                               %
+%                                                                             %
+%  Unless required by applicable law or agreed to in writing, software        %
+%  distributed under the License is distributed on an "AS IS" BASIS,          %
+%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
+%  See the License for the specific language governing permissions and        %
+%  limitations under the License.                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+
+/*
+  Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+
+/*
+  Enumerated declarations.
+*/
+typedef enum
+{
+  SF3_PIXEL_INT8 = 0x01,
+  SF3_PIXEL_INT16 = 0x02,
+  SF3_PIXEL_INT32 = 0x04,
+  SF3_PIXEL_INT64 = 0x08,
+  SF3_PIXEL_UINT8 = 0x11,
+  SF3_PIXEL_UINT16 = 0x12,
+  SF3_PIXEL_UINT32 = 0x14,
+  SF3_PIXEL_UINT64 = 0x18,
+  SF3_PIXEL_FLOAT16 = 0x22,
+  SF3_PIXEL_FLOAT32 = 0x24,
+  SF3_PIXEL_FLOAT64 = 0x28
+} SF3PixelFormat;
+
+typedef enum
+{
+  SF3_PIXEL_V = 0x01,
+  SF3_PIXEL_VA = 0x02,
+  SF3_PIXEL_RGB = 0x03,
+  SF3_PIXEL_RGBA = 0x04,
+  SF3_PIXEL_AV = 0x12,
+  SF3_PIXEL_BGR = 0x13,
+  SF3_PIXEL_ABGR = 0x14,
+  SF3_PIXEL_ARGB = 0x24,
+  SF3_PIXEL_BGRA = 0x34,
+  SF3_PIXEL_CMYK = 0x44,
+  SF3_PIXEL_KYMC = 0x54,
+} SF3ChannelLayout;
+
+/*
+  Forward declarations.
+*/
+static MagickBooleanType
+  WriteSF3Image(const ImageInfo *,Image *,ExceptionInfo *);
+
+/*
+  CRC32 Implementation without dependency on zlib.
+*/
+static const unsigned int CRC32Table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+static unsigned int crc32(unsigned int crc, const void *buf, size_t size)
+{
+  const unsigned char *p = (const unsigned char*)buf;
+
+  while (size--)
+	crc = CRC32Table[(crc ^ *p++) & 0xff] ^ (crc >> 8);
+  
+  return crc;
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   I s S F 3                                                                 %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  IsSF3()() returns MagickTrue if the image format type, identified by the
+%  magick string, is SF3.
+%
+%  The format of the IsSF3 method is:
+%
+%      MagickBooleanType IsSF3(const unsigned char *magick,const size_t length)
+%
+%  A description of each parameter follows:
+%
+%    o magick: compare image format pattern against these bytes.
+%
+%    o length: Specifies the length of the magick string.
+%
+*/
+static unsigned int IsSF3(const unsigned char *magick,const size_t length)
+{
+  /*
+    The header is 16 bytes long, though the last 5 bytes aren't constant.
+  */
+  if (length < 16)
+    return(MagickFalse);
+  if (memcmp(magick,"\x81SF3\x00\xE0\xD0\r\n\n\x03",11) == 0)
+    return(MagickTrue);
+  return(MagickFalse);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e a d S F 3 I m a g e                                                   %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  ReadSF3Image() reads a Simple File Format Family image file and returns it.
+%  It allocates the memory necessary for the new Image structure and returns a
+%  pointer to the new image.
+%
+%  The format of the ReadSF3Image method is:
+%
+%      Image *ReadSF3Image(image_info,ExceptionInfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o image_info: the image info.
+%
+%    o exception: return any errors or warnings in this structure.
+%
+*/
+static Image *ReadSF3Image(const ImageInfo *image_info,ExceptionInfo *exception)
+{
+  MagickBooleanType
+    status;
+
+  Image
+    *image;
+
+  ssize_t
+    count = 0;
+  
+  unsigned char
+    channels,
+    format;
+
+  unsigned int
+    width,
+    height,
+    layers;
+
+  unsigned char
+    header[16];
+
+  /*
+    Open image file.
+  */
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickCoreSignature);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
+  if (IsEventLogging() != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
+      image_info->filename);
+  image=AcquireImage(image_info,exception);
+  status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
+  if (status == MagickFalse)
+    return(DestroyImageList(image));
+  /*
+    Read SF3 header information.
+  */
+  count=ReadBlob(image,16,header);
+  if ((count != 16) || (memcmp(header,"\x81SF3\x00\xE0\xD0\r\n\n\x03",11) != 0))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  width=ReadBlobLSBLong(image);
+  height=ReadBlobLSBLong(image);
+  layers = ReadBlobLSBLong(image);
+  if (width == 0 || height == 0 || layers == 0)
+    ThrowReaderException(CorruptImageError,"NegativeOrZeroImageSize");
+  channels=(unsigned char) ReadBlobByte(image);
+  format=(unsigned char) ReadBlobByte(image);
+  
+  for (unsigned int z=0; z<layers; ++z)
+    {
+      QuantumInfo
+        *quantum_info;
+
+      QuantumType
+        quantum_type;
+
+      size_t
+        length = 0;
+
+      ssize_t
+        y;
+
+      unsigned char
+        *pixels;
+
+      image->endian=LSBEndian;
+      image->compression=NoCompression;
+      image->orientation=TopLeftOrientation;
+      image->columns=(size_t) width;
+      image->rows=(size_t) height;
+      image->depth=(size_t)((format & 0xF)*8);
+      if (image_info->ping != MagickFalse)
+        break;
+      if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0))
+        if (image->scene >= (image_info->scene+image_info->number_scenes-1))
+          break;
+      status=SetImageExtent(image,image->columns,image->rows,exception);
+      if (status == MagickFalse)
+        return(DestroyImageList(image));
+      switch(channels)
+        {
+        case SF3_PIXEL_V:
+          (void) SetImageColorspace(image,GRAYColorspace,exception);
+          SetQuantumImageType(image,GrayQuantum);
+          break;
+        case SF3_PIXEL_VA:
+          (void) SetImageColorspace(image,GRAYColorspace,exception);
+          SetQuantumImageType(image,GrayAlphaQuantum);
+          break;
+        case SF3_PIXEL_RGB:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,RGBQuantum);
+          break;
+        case SF3_PIXEL_RGBA:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,RGBAQuantum);
+          break;
+        case SF3_PIXEL_AV:
+          (void) SetImageColorspace(image,GRAYColorspace,exception);
+          SetQuantumImageType(image,GrayAlphaQuantum);
+          break;
+        case SF3_PIXEL_BGR:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,BGRQuantum);
+          break;
+        case SF3_PIXEL_ABGR:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,BGRAQuantum);
+          break;
+        case SF3_PIXEL_ARGB:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,RGBAQuantum);
+          break;
+        case SF3_PIXEL_BGRA:
+          (void) SetImageColorspace(image,RGBColorspace,exception);
+          SetQuantumImageType(image,BGRAQuantum);
+          break;
+        case SF3_PIXEL_CMYK:
+          (void) SetImageColorspace(image,CMYKColorspace,exception);
+          SetQuantumImageType(image,CMYKQuantum);
+          break;
+        case SF3_PIXEL_KYMC:
+          (void) SetImageColorspace(image,CMYKColorspace,exception);
+          SetQuantumImageType(image,CMYKQuantum);
+          break;
+        default:
+          ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+        }
+      quantum_type=GetQuantumType(image,exception);
+      quantum_info=AcquireQuantumInfo(image_info,image);
+      if (quantum_info == (QuantumInfo *) NULL)
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+      switch(format)
+        {
+        case SF3_PIXEL_INT8:
+        case SF3_PIXEL_INT16:
+        case SF3_PIXEL_INT32:
+        case SF3_PIXEL_INT64:
+          status=SetQuantumFormat(image,quantum_info,SignedQuantumFormat);
+          break;
+        case SF3_PIXEL_UINT8:
+        case SF3_PIXEL_UINT16:
+        case SF3_PIXEL_UINT32:
+        case SF3_PIXEL_UINT64:
+          status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
+          break;
+        case SF3_PIXEL_FLOAT16:
+        case SF3_PIXEL_FLOAT32:
+        case SF3_PIXEL_FLOAT64:
+          status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat);
+          break;
+        default:
+          quantum_info=DestroyQuantumInfo(quantum_info);
+          ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+        }
+      if (status == MagickFalse)
+        {
+          quantum_info=DestroyQuantumInfo(quantum_info);
+          ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+        }
+      status=SetImageExtent(image,image->columns,image->rows,exception);
+      if (status == MagickFalse){
+        quantum_info=DestroyQuantumInfo(quantum_info);
+        return(DestroyImageList(image));
+      }
+      length=image->columns*(format & 0xF)*(channels & 0xF);
+      pixels=GetQuantumPixels(quantum_info);
+      for (y=0; y < (ssize_t) image->rows; ++y)
+        {
+          count=ReadBlob(image,length,pixels);
+          if (count != (ssize_t) length)
+            break;
+          (void) GetAuthenticPixels(image,0,y,image->columns,1,exception);
+          (void) ImportQuantumPixels(image,(CacheView *) NULL,
+                                    quantum_info,quantum_type,pixels,exception);
+          if (SyncAuthenticPixels(image,exception) == MagickFalse)
+            break;
+        }
+      quantum_info=DestroyQuantumInfo(quantum_info);
+      if (y < (ssize_t) image->rows)
+        {
+          ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+            image->filename);
+          break;
+        }
+      if (image_info->number_scenes != 0)
+        if (image->scene >= (image_info->scene+image_info->number_scenes-1))
+          break;
+      if ((z+1) == layers)
+        break;
+      AcquireNextImage(image_info,image,exception);
+      if (GetNextImageInList(image) == (Image *) NULL)
+        {
+          status=MagickFalse;
+          break;
+        }
+      image=SyncNextImageInList(image);
+      status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
+                              GetBlobSize(image));
+      if (status == MagickFalse)
+        break;
+    }
+  if (status == MagickFalse)
+    return(DestroyImageList(image));
+  return(GetFirstImageInList(image));
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e g i s t e r S F 3 I m a g e                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  RegisterSF3Image() adds properties for the SF3 image format to
+%  the list of supported formats.  The properties include the image format
+%  tag, a method to read and/or write the format, whether the format
+%  supports the saving of more than one frame to the same file or blob,
+%  whether the format supports native in-memory I/O, and a brief
+%  description of the format.
+%
+%  The format of the RegisterSF3Image method is:
+%
+%      size_t RegisterSF3Image(void)
+%
+*/
+ModuleExport size_t RegisterSF3Image(void)
+{
+  MagickInfo
+    *entry;
+
+  static const char
+    SF3Note[] =
+    {
+      "See https://shirakumo.org/docs/sf3/ for information on the SF3 file"
+      " formats."
+    };
+
+  entry=AcquireMagickInfo("SF3","SF3","Simple File Format Family Images");
+  entry->decoder=(DecodeImageHandler *) ReadSF3Image;
+  entry->encoder=(EncodeImageHandler *) WriteSF3Image;
+  entry->magick=(IsImageFormatHandler *) IsSF3;
+  entry->flags|=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderDecoderSeekableStreamFlag;
+  entry->flags|=CoderEncoderSeekableStreamFlag;
+  entry->format_type=ImplicitFormatType;
+  entry->mime_type=ConstantString("image/x.sf3");
+  entry->note=ConstantString(SF3Note);
+  (void) RegisterMagickInfo(entry);
+  return(MagickImageCoderSignature);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   U n r e g i s t e r S F 3 I m a g e                                       %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  UnregisterSF3Image() removes format registrations made by the
+%  SF3 module from the list of supported formats.
+%
+%  The format of the UnregisterSF3Image method is:
+%
+%      UnregisterSF3Image(void)
+%
+*/
+ModuleExport void UnregisterSF3Image(void)
+{
+  (void) UnregisterMagickInfo("SF3");
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   W r i t e S F 3 I m a g e                                                 %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  WriteSF3Image() writes an image in the Simple File Format Family image
+%  format.
+%
+%  The format of the WriteSF3Image method is:
+%
+%      MagickBooleanType WriteSF3Image(const ImageInfo *image_info,
+%        Image *image,ExceptionInfo *exception)
+%
+%  A description of each parameter follows.
+%
+%    o image_info: the image info.
+%
+%    o image:  The image.
+%
+%    o exception: return any errors or warnings in this structure.
+%
+*/
+static MagickBooleanType WriteSF3Image(const ImageInfo *image_info,Image *image,
+  ExceptionInfo *exception)
+{
+  MagickBooleanType
+    status;
+
+  QuantumInfo
+    *quantum_info;
+
+  QuantumFormatType
+    quantum_format;
+
+  QuantumType
+    quantum_type;
+
+  size_t
+    length,
+    number_scenes;
+
+  ssize_t
+    count,
+    scene,
+    y;
+
+  unsigned char
+    channels,
+    format,
+    header[16],
+    *pixels;
+  
+  unsigned int
+    checksum;
+
+  /*
+    Open output image file.
+  */
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickCoreSignature);
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
+  if (IsEventLogging() != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
+  if (status == MagickFalse)
+    return(status);
+  if ((image->columns > 4294967295UL) || (image->rows > 4294967295UL))
+    ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
+  quantum_info=AcquireQuantumInfo(image_info,image);
+  if (quantum_info == (QuantumInfo *) NULL)
+    ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+  (void) SetQuantumEndian(image,quantum_info,LSBEndian);
+  (void) SetQuantumPad(image,quantum_info,0);
+  number_scenes=GetImageListLength(image);
+  quantum_type=GetQuantumType(image,exception);
+  quantum_format=GetQuantumFormat(quantum_info);
+  switch (quantum_type)
+    {
+    case GrayQuantum:
+      channels = SF3_PIXEL_V;
+      quantum_type = GrayQuantum;
+      break;
+    case AlphaQuantum:
+    case OpacityQuantum:
+    case GrayAlphaQuantum:
+      channels = SF3_PIXEL_VA;
+      quantum_type = GrayAlphaQuantum;
+      break;
+    case IndexQuantum:
+    case CbYCrQuantum:
+    case MultispectralQuantum:
+    case RedQuantum:
+    case GreenQuantum:
+    case BlueQuantum:
+    case RGBPadQuantum:
+    case RGBQuantum:
+      channels = SF3_PIXEL_RGB;
+      quantum_type = RGBQuantum;
+      break;
+    case UndefinedQuantum:
+    case IndexAlphaQuantum:
+    case CbYCrAQuantum:
+    case CMYKAQuantum:
+    case CMYKOQuantum:
+    case RGBOQuantum:
+    case RGBAQuantum:
+      channels = SF3_PIXEL_RGBA;
+      quantum_type = RGBAQuantum;
+      break;
+    case BGROQuantum:
+    case BGRAQuantum:
+      channels = SF3_PIXEL_BGRA;
+      quantum_type = BGRAQuantum;
+      break;
+    case BGRQuantum:
+      channels = SF3_PIXEL_BGR;
+      quantum_type = BGRQuantum;
+      break;
+    case CyanQuantum:
+    case MagentaQuantum:
+    case YellowQuantum:
+    case BlackQuantum:
+    case CMYKQuantum:
+      channels = SF3_PIXEL_CMYK;
+      quantum_type = CMYKQuantum;
+      break;
+    default:
+      quantum_info=DestroyQuantumInfo(quantum_info);
+      ThrowWriterException(CoderError,"ImageTypeNotSupported");
+      break;
+    }
+  switch (quantum_format)
+    {
+    case FloatingPointQuantumFormat:
+      if (image->depth <= 16)
+        {
+          format = SF3_PIXEL_FLOAT16;
+          SetQuantumDepth(image,quantum_info,16);
+        }
+      else if (image->depth <= 32)
+        {
+          format = SF3_PIXEL_FLOAT32;
+          SetQuantumDepth(image,quantum_info,32);
+        }
+      else
+        {
+          format = SF3_PIXEL_FLOAT64;
+          SetQuantumDepth(image,quantum_info,64);
+        }
+      break;
+    case SignedQuantumFormat:
+      if (image->depth <= 8)
+        {
+          format = SF3_PIXEL_INT8;
+          SetQuantumDepth(image,quantum_info,8);
+        }
+      else if (image->depth <= 16)
+        {
+          format = SF3_PIXEL_INT16;
+          SetQuantumDepth(image,quantum_info,16);
+        }
+      else if (image->depth <= 32)
+        {
+          format = SF3_PIXEL_INT32;
+          SetQuantumDepth(image,quantum_info,32);
+        }
+      else
+        {
+          format = SF3_PIXEL_INT64;
+          SetQuantumDepth(image,quantum_info,64);
+        }
+      break;
+    case UndefinedQuantumFormat:
+    case UnsignedQuantumFormat:
+      SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
+      if (image->depth <= 8)
+        {
+          format = SF3_PIXEL_UINT8;
+          SetQuantumDepth(image,quantum_info,8);
+        }
+      else if (image->depth <= 16)
+        {
+          format = SF3_PIXEL_UINT16;
+          SetQuantumDepth(image,quantum_info,16);
+        }
+      else if (image->depth <= 32)
+        {
+          format = SF3_PIXEL_UINT32;
+          SetQuantumDepth(image,quantum_info,32);
+        }
+      else
+        {
+          format = SF3_PIXEL_UINT64;
+          SetQuantumDepth(image,quantum_info,64);
+        }
+      break;
+    default:
+      quantum_info=DestroyQuantumInfo(quantum_info);
+      ThrowWriterException(CoderError,"ImageTypeNotSupported");
+      break;
+    }
+  /*
+    Write SF3 header.
+  */
+  (void) WriteBlob(image,11,"\x81SF3\x00\xE0\xD0\r\n\n\x03");
+  (void) WriteBlobLSBLong(image,(unsigned int) 0); // Zero CRC32 for now
+  (void) WriteBlobByte(image,(unsigned char) 0);
+  checksum=0xFFFFFFFF;
+  (void) WriteBlobLSBLong(image,(unsigned int) image->columns);
+  (void) WriteBlobLSBLong(image,(unsigned int) image->rows);
+  (void) WriteBlobLSBLong(image,(unsigned int) number_scenes);
+  (void) WriteBlobByte(image,channels);
+  (void) WriteBlobByte(image,format);
+  if(IsBlobSeekable(image)){
+    (void) SeekBlob(image,16,SEEK_SET);
+    (void) ReadBlob(image,14,header);
+    checksum=crc32(checksum,header,14);
+  }
+  /*
+    Write pixels.
+  */
+  scene=0;
+  do
+  {
+    const Quantum
+      *magick_restrict p;
+    pixels=(unsigned char *) GetQuantumPixels(quantum_info);
+    for (y=0; y < (ssize_t) image->rows; y++)
+      {
+        p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+        if (p == (const Quantum *) NULL)
+          break;
+        length=ExportQuantumPixels(image,(CacheView *)NULL,quantum_info,
+                                   quantum_type,pixels,exception);
+        checksum=crc32(checksum,pixels,length);
+        count=WriteBlob(image,length,pixels);
+        if (count != (ssize_t) length)
+          break;
+      }
+    if (GetNextImageInList(image) == (Image *) NULL)
+      break;
+    image=SyncNextImageInList(image);
+    status=SetImageProgress(image,SaveImagesTag,scene++,number_scenes);
+    if (status == MagickFalse)
+      break;
+  }while (image_info->adjoin != MagickFalse);
+  /*
+    Finish up.
+   */
+  quantum_info=DestroyQuantumInfo(quantum_info);
+  if(IsBlobSeekable(image)){
+    (void) SeekBlob(image,11,SEEK_SET);
+    (void) WriteBlobLSBLong(image,checksum  ^ 0xFFFFFFFF);
+  }
+  if (CloseBlob(image) == MagickFalse)
+    status=MagickFalse;
+  return(status);
+}
diff --git a/ImageMagick-7.1.2-1/coders/sf3.h b/ImageMagick-7.1.2-1/coders/sf3.h
new file mode 100644
index 000000000..ec07d7e9f
--- /dev/null
+++ b/ImageMagick-7.1.2-1/coders/sf3.h
@@ -0,0 +1,32 @@
+/*
+  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
+  obtain a copy of the License at
+  
+    https://imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+#include "coders/coders-private.h"
+
+#define MagickSF3Headers \
+  MagickCoderHeader("SF3", 0, "\x81SF3\x00\xE0\xD0\r\n\n\x03")
+
+#define MagickSF3Aliases
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+MagickCoderExports(SF3)
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
diff --git a/ImageMagick-7.1.2-0/coders/sfw.c b/ImageMagick-7.1.2-1/coders/sfw.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sfw.c
rename to ImageMagick-7.1.2-1/coders/sfw.c
diff --git a/ImageMagick-7.1.2-0/coders/sfw.h b/ImageMagick-7.1.2-1/coders/sfw.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sfw.h
rename to ImageMagick-7.1.2-1/coders/sfw.h
diff --git a/ImageMagick-7.1.2-0/coders/sgi.c b/ImageMagick-7.1.2-1/coders/sgi.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sgi.c
rename to ImageMagick-7.1.2-1/coders/sgi.c
diff --git a/ImageMagick-7.1.2-0/coders/sgi.h b/ImageMagick-7.1.2-1/coders/sgi.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sgi.h
rename to ImageMagick-7.1.2-1/coders/sgi.h
diff --git a/ImageMagick-7.1.2-0/coders/sixel.c b/ImageMagick-7.1.2-1/coders/sixel.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sixel.c
rename to ImageMagick-7.1.2-1/coders/sixel.c
diff --git a/ImageMagick-7.1.2-0/coders/sixel.h b/ImageMagick-7.1.2-1/coders/sixel.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sixel.h
rename to ImageMagick-7.1.2-1/coders/sixel.h
diff --git a/ImageMagick-7.1.2-0/coders/stegano.c b/ImageMagick-7.1.2-1/coders/stegano.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/stegano.c
rename to ImageMagick-7.1.2-1/coders/stegano.c
diff --git a/ImageMagick-7.1.2-0/coders/stegano.h b/ImageMagick-7.1.2-1/coders/stegano.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/stegano.h
rename to ImageMagick-7.1.2-1/coders/stegano.h
diff --git a/ImageMagick-7.1.2-0/coders/strimg.c b/ImageMagick-7.1.2-1/coders/strimg.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/strimg.c
rename to ImageMagick-7.1.2-1/coders/strimg.c
diff --git a/ImageMagick-7.1.2-0/coders/strimg.h b/ImageMagick-7.1.2-1/coders/strimg.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/strimg.h
rename to ImageMagick-7.1.2-1/coders/strimg.h
diff --git a/ImageMagick-7.1.2-0/coders/sun.c b/ImageMagick-7.1.2-1/coders/sun.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sun.c
rename to ImageMagick-7.1.2-1/coders/sun.c
diff --git a/ImageMagick-7.1.2-0/coders/sun.h b/ImageMagick-7.1.2-1/coders/sun.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/sun.h
rename to ImageMagick-7.1.2-1/coders/sun.h
diff --git a/ImageMagick-7.1.2-0/coders/svg.c b/ImageMagick-7.1.2-1/coders/svg.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/svg.c
rename to ImageMagick-7.1.2-1/coders/svg.c
diff --git a/ImageMagick-7.1.2-0/coders/svg.h b/ImageMagick-7.1.2-1/coders/svg.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/svg.h
rename to ImageMagick-7.1.2-1/coders/svg.h
diff --git a/ImageMagick-7.1.2-0/coders/tga.c b/ImageMagick-7.1.2-1/coders/tga.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tga.c
rename to ImageMagick-7.1.2-1/coders/tga.c
diff --git a/ImageMagick-7.1.2-0/coders/tga.h b/ImageMagick-7.1.2-1/coders/tga.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tga.h
rename to ImageMagick-7.1.2-1/coders/tga.h
diff --git a/ImageMagick-7.1.2-0/coders/thumbnail.c b/ImageMagick-7.1.2-1/coders/thumbnail.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/thumbnail.c
rename to ImageMagick-7.1.2-1/coders/thumbnail.c
diff --git a/ImageMagick-7.1.2-0/coders/thumbnail.h b/ImageMagick-7.1.2-1/coders/thumbnail.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/thumbnail.h
rename to ImageMagick-7.1.2-1/coders/thumbnail.h
diff --git a/ImageMagick-7.1.2-0/coders/tiff.c b/ImageMagick-7.1.2-1/coders/tiff.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tiff.c
rename to ImageMagick-7.1.2-1/coders/tiff.c
diff --git a/ImageMagick-7.1.2-0/coders/tiff.h b/ImageMagick-7.1.2-1/coders/tiff.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tiff.h
rename to ImageMagick-7.1.2-1/coders/tiff.h
diff --git a/ImageMagick-7.1.2-0/coders/tile.c b/ImageMagick-7.1.2-1/coders/tile.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tile.c
rename to ImageMagick-7.1.2-1/coders/tile.c
diff --git a/ImageMagick-7.1.2-0/coders/tile.h b/ImageMagick-7.1.2-1/coders/tile.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tile.h
rename to ImageMagick-7.1.2-1/coders/tile.h
diff --git a/ImageMagick-7.1.2-0/coders/tim.c b/ImageMagick-7.1.2-1/coders/tim.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tim.c
rename to ImageMagick-7.1.2-1/coders/tim.c
diff --git a/ImageMagick-7.1.2-0/coders/tim.h b/ImageMagick-7.1.2-1/coders/tim.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tim.h
rename to ImageMagick-7.1.2-1/coders/tim.h
diff --git a/ImageMagick-7.1.2-0/coders/tim2.c b/ImageMagick-7.1.2-1/coders/tim2.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tim2.c
rename to ImageMagick-7.1.2-1/coders/tim2.c
diff --git a/ImageMagick-7.1.2-0/coders/tim2.h b/ImageMagick-7.1.2-1/coders/tim2.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/tim2.h
rename to ImageMagick-7.1.2-1/coders/tim2.h
diff --git a/ImageMagick-7.1.2-0/coders/ttf.c b/ImageMagick-7.1.2-1/coders/ttf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ttf.c
rename to ImageMagick-7.1.2-1/coders/ttf.c
diff --git a/ImageMagick-7.1.2-0/coders/ttf.h b/ImageMagick-7.1.2-1/coders/ttf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ttf.h
rename to ImageMagick-7.1.2-1/coders/ttf.h
diff --git a/ImageMagick-7.1.2-0/coders/txt.c b/ImageMagick-7.1.2-1/coders/txt.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/txt.c
rename to ImageMagick-7.1.2-1/coders/txt.c
diff --git a/ImageMagick-7.1.2-0/coders/txt.h b/ImageMagick-7.1.2-1/coders/txt.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/txt.h
rename to ImageMagick-7.1.2-1/coders/txt.h
diff --git a/ImageMagick-7.1.2-0/coders/uhdr.c b/ImageMagick-7.1.2-1/coders/uhdr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uhdr.c
rename to ImageMagick-7.1.2-1/coders/uhdr.c
diff --git a/ImageMagick-7.1.2-0/coders/uhdr.h b/ImageMagick-7.1.2-1/coders/uhdr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uhdr.h
rename to ImageMagick-7.1.2-1/coders/uhdr.h
diff --git a/ImageMagick-7.1.2-0/coders/uil.c b/ImageMagick-7.1.2-1/coders/uil.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uil.c
rename to ImageMagick-7.1.2-1/coders/uil.c
diff --git a/ImageMagick-7.1.2-0/coders/uil.h b/ImageMagick-7.1.2-1/coders/uil.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uil.h
rename to ImageMagick-7.1.2-1/coders/uil.h
diff --git a/ImageMagick-7.1.2-0/coders/url.c b/ImageMagick-7.1.2-1/coders/url.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/url.c
rename to ImageMagick-7.1.2-1/coders/url.c
diff --git a/ImageMagick-7.1.2-0/coders/url.h b/ImageMagick-7.1.2-1/coders/url.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/url.h
rename to ImageMagick-7.1.2-1/coders/url.h
diff --git a/ImageMagick-7.1.2-0/coders/uyvy.c b/ImageMagick-7.1.2-1/coders/uyvy.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uyvy.c
rename to ImageMagick-7.1.2-1/coders/uyvy.c
diff --git a/ImageMagick-7.1.2-0/coders/uyvy.h b/ImageMagick-7.1.2-1/coders/uyvy.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/uyvy.h
rename to ImageMagick-7.1.2-1/coders/uyvy.h
diff --git a/ImageMagick-7.1.2-0/coders/vicar.c b/ImageMagick-7.1.2-1/coders/vicar.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vicar.c
rename to ImageMagick-7.1.2-1/coders/vicar.c
diff --git a/ImageMagick-7.1.2-0/coders/vicar.h b/ImageMagick-7.1.2-1/coders/vicar.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vicar.h
rename to ImageMagick-7.1.2-1/coders/vicar.h
diff --git a/ImageMagick-7.1.2-0/coders/vid.c b/ImageMagick-7.1.2-1/coders/vid.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vid.c
rename to ImageMagick-7.1.2-1/coders/vid.c
diff --git a/ImageMagick-7.1.2-0/coders/vid.h b/ImageMagick-7.1.2-1/coders/vid.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vid.h
rename to ImageMagick-7.1.2-1/coders/vid.h
diff --git a/ImageMagick-7.1.2-0/coders/video.c b/ImageMagick-7.1.2-1/coders/video.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/video.c
rename to ImageMagick-7.1.2-1/coders/video.c
diff --git a/ImageMagick-7.1.2-0/coders/video.h b/ImageMagick-7.1.2-1/coders/video.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/video.h
rename to ImageMagick-7.1.2-1/coders/video.h
diff --git a/ImageMagick-7.1.2-0/coders/viff.c b/ImageMagick-7.1.2-1/coders/viff.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/viff.c
rename to ImageMagick-7.1.2-1/coders/viff.c
diff --git a/ImageMagick-7.1.2-0/coders/viff.h b/ImageMagick-7.1.2-1/coders/viff.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/viff.h
rename to ImageMagick-7.1.2-1/coders/viff.h
diff --git a/ImageMagick-7.1.2-0/coders/vips.c b/ImageMagick-7.1.2-1/coders/vips.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vips.c
rename to ImageMagick-7.1.2-1/coders/vips.c
diff --git a/ImageMagick-7.1.2-0/coders/vips.h b/ImageMagick-7.1.2-1/coders/vips.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/vips.h
rename to ImageMagick-7.1.2-1/coders/vips.h
diff --git a/ImageMagick-7.1.2-0/coders/wbmp.c b/ImageMagick-7.1.2-1/coders/wbmp.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wbmp.c
rename to ImageMagick-7.1.2-1/coders/wbmp.c
diff --git a/ImageMagick-7.1.2-0/coders/wbmp.h b/ImageMagick-7.1.2-1/coders/wbmp.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wbmp.h
rename to ImageMagick-7.1.2-1/coders/wbmp.h
diff --git a/ImageMagick-7.1.2-0/coders/webp.c b/ImageMagick-7.1.2-1/coders/webp.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/webp.c
rename to ImageMagick-7.1.2-1/coders/webp.c
diff --git a/ImageMagick-7.1.2-0/coders/webp.h b/ImageMagick-7.1.2-1/coders/webp.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/webp.h
rename to ImageMagick-7.1.2-1/coders/webp.h
diff --git a/ImageMagick-7.1.2-0/coders/wmf.c b/ImageMagick-7.1.2-1/coders/wmf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wmf.c
rename to ImageMagick-7.1.2-1/coders/wmf.c
diff --git a/ImageMagick-7.1.2-0/coders/wmf.h b/ImageMagick-7.1.2-1/coders/wmf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wmf.h
rename to ImageMagick-7.1.2-1/coders/wmf.h
diff --git a/ImageMagick-7.1.2-0/coders/wpg.c b/ImageMagick-7.1.2-1/coders/wpg.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wpg.c
rename to ImageMagick-7.1.2-1/coders/wpg.c
diff --git a/ImageMagick-7.1.2-0/coders/wpg.h b/ImageMagick-7.1.2-1/coders/wpg.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/wpg.h
rename to ImageMagick-7.1.2-1/coders/wpg.h
diff --git a/ImageMagick-7.1.2-0/coders/x.c b/ImageMagick-7.1.2-1/coders/x.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/x.c
rename to ImageMagick-7.1.2-1/coders/x.c
diff --git a/ImageMagick-7.1.2-0/coders/x.h b/ImageMagick-7.1.2-1/coders/x.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/x.h
rename to ImageMagick-7.1.2-1/coders/x.h
diff --git a/ImageMagick-7.1.2-0/coders/xbm.c b/ImageMagick-7.1.2-1/coders/xbm.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xbm.c
rename to ImageMagick-7.1.2-1/coders/xbm.c
diff --git a/ImageMagick-7.1.2-0/coders/xbm.h b/ImageMagick-7.1.2-1/coders/xbm.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xbm.h
rename to ImageMagick-7.1.2-1/coders/xbm.h
diff --git a/ImageMagick-7.1.2-0/coders/xc.c b/ImageMagick-7.1.2-1/coders/xc.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xc.c
rename to ImageMagick-7.1.2-1/coders/xc.c
diff --git a/ImageMagick-7.1.2-0/coders/xc.h b/ImageMagick-7.1.2-1/coders/xc.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xc.h
rename to ImageMagick-7.1.2-1/coders/xc.h
diff --git a/ImageMagick-7.1.2-0/coders/xcf.c b/ImageMagick-7.1.2-1/coders/xcf.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xcf.c
rename to ImageMagick-7.1.2-1/coders/xcf.c
diff --git a/ImageMagick-7.1.2-0/coders/xcf.h b/ImageMagick-7.1.2-1/coders/xcf.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xcf.h
rename to ImageMagick-7.1.2-1/coders/xcf.h
diff --git a/ImageMagick-7.1.2-0/coders/xpm.c b/ImageMagick-7.1.2-1/coders/xpm.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xpm.c
rename to ImageMagick-7.1.2-1/coders/xpm.c
diff --git a/ImageMagick-7.1.2-0/coders/xpm.h b/ImageMagick-7.1.2-1/coders/xpm.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xpm.h
rename to ImageMagick-7.1.2-1/coders/xpm.h
diff --git a/ImageMagick-7.1.2-0/coders/xps.c b/ImageMagick-7.1.2-1/coders/xps.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xps.c
rename to ImageMagick-7.1.2-1/coders/xps.c
diff --git a/ImageMagick-7.1.2-0/coders/xps.h b/ImageMagick-7.1.2-1/coders/xps.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xps.h
rename to ImageMagick-7.1.2-1/coders/xps.h
diff --git a/ImageMagick-7.1.2-0/coders/xwd.c b/ImageMagick-7.1.2-1/coders/xwd.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xwd.c
rename to ImageMagick-7.1.2-1/coders/xwd.c
diff --git a/ImageMagick-7.1.2-0/coders/xwd.h b/ImageMagick-7.1.2-1/coders/xwd.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/xwd.h
rename to ImageMagick-7.1.2-1/coders/xwd.h
diff --git a/ImageMagick-7.1.2-0/coders/yaml.c b/ImageMagick-7.1.2-1/coders/yaml.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/yaml.c
rename to ImageMagick-7.1.2-1/coders/yaml.c
diff --git a/ImageMagick-7.1.2-0/coders/yaml.h b/ImageMagick-7.1.2-1/coders/yaml.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/yaml.h
rename to ImageMagick-7.1.2-1/coders/yaml.h
diff --git a/ImageMagick-7.1.2-0/coders/ycbcr.c b/ImageMagick-7.1.2-1/coders/ycbcr.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ycbcr.c
rename to ImageMagick-7.1.2-1/coders/ycbcr.c
diff --git a/ImageMagick-7.1.2-0/coders/ycbcr.h b/ImageMagick-7.1.2-1/coders/ycbcr.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/ycbcr.h
rename to ImageMagick-7.1.2-1/coders/ycbcr.h
diff --git a/ImageMagick-7.1.2-0/coders/yuv.c b/ImageMagick-7.1.2-1/coders/yuv.c
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/yuv.c
rename to ImageMagick-7.1.2-1/coders/yuv.c
diff --git a/ImageMagick-7.1.2-0/coders/yuv.h b/ImageMagick-7.1.2-1/coders/yuv.h
similarity index 100%
rename from ImageMagick-7.1.2-0/coders/yuv.h
rename to ImageMagick-7.1.2-1/coders/yuv.h
diff --git a/ImageMagick-7.1.2-0/configs/arm/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-1/configs/arm/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-0/configs/arm/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-1/configs/arm/MagickCore/magick-baseconfig.h
index 891c975b7..c89f3fe44 100644
--- a/ImageMagick-7.1.2-0/configs/arm/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-1/configs/arm/MagickCore/magick-baseconfig.h
@@ -1203,7 +1203,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-0"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-1"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1218,7 +1218,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.1.2-0"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-0"
+#define MAGICKCORE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-0/configs/arm/MagickCore/version.h b/ImageMagick-7.1.2-1/configs/arm/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-0/configs/arm/MagickCore/version.h
rename to ImageMagick-7.1.2-1/configs/arm/MagickCore/version.h
index dc7aa3f2a..7d22f33c6 100644
--- a/ImageMagick-7.1.2-0/configs/arm/MagickCore/version.h
+++ b/ImageMagick-7.1.2-1/configs/arm/MagickCore/version.h
@@ -30,16 +30,16 @@ extern "C" {
 #define MagickLibVersion  0x712
 #define MagickLibVersionText  "7.1.2"
 #define MagickLibVersionNumber  10,0,2
-#define MagickLibAddendum  "-0"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "arm"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-0"
+#define MagickppLibAddendum  "-1"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-07-12"
+#define MagickReleaseDate  "2025-08-11"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-0/configs/arm64/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-1/configs/arm64/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-0/configs/arm64/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-1/configs/arm64/MagickCore/magick-baseconfig.h
index 94e52d971..13163f406 100644
--- a/ImageMagick-7.1.2-0/configs/arm64/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-1/configs/arm64/MagickCore/magick-baseconfig.h
@@ -1203,7 +1203,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-0"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-1"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1218,7 +1218,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.1.2-0"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-0"
+#define MAGICKCORE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-0/configs/arm64/MagickCore/version.h b/ImageMagick-7.1.2-1/configs/arm64/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-0/configs/arm64/MagickCore/version.h
rename to ImageMagick-7.1.2-1/configs/arm64/MagickCore/version.h
index a0dd15704..7dc5d5576 100644
--- a/ImageMagick-7.1.2-0/configs/arm64/MagickCore/version.h
+++ b/ImageMagick-7.1.2-1/configs/arm64/MagickCore/version.h
@@ -30,16 +30,16 @@ extern "C" {
 #define MagickLibVersion  0x712
 #define MagickLibVersionText  "7.1.2"
 #define MagickLibVersionNumber  10,0,2
-#define MagickLibAddendum  "-0"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "aarch64"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-0"
+#define MagickppLibAddendum  "-1"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-07-12"
+#define MagickReleaseDate  "2025-08-11"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-0/configs/x86-64/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-1/configs/x86-64/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-0/configs/x86-64/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-1/configs/x86-64/MagickCore/magick-baseconfig.h
index afdd4f0c5..f04fb5a8a 100644
--- a/ImageMagick-7.1.2-0/configs/x86-64/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-1/configs/x86-64/MagickCore/magick-baseconfig.h
@@ -1203,7 +1203,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-0"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-1"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1218,7 +1218,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.1.2-0"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-0"
+#define MAGICKCORE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-0/configs/x86-64/MagickCore/version.h b/ImageMagick-7.1.2-1/configs/x86-64/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-0/configs/x86-64/MagickCore/version.h
rename to ImageMagick-7.1.2-1/configs/x86-64/MagickCore/version.h
index 52ae0f521..d89565bb0 100644
--- a/ImageMagick-7.1.2-0/configs/x86-64/MagickCore/version.h
+++ b/ImageMagick-7.1.2-1/configs/x86-64/MagickCore/version.h
@@ -30,16 +30,16 @@ extern "C" {
 #define MagickLibVersion  0x712
 #define MagickLibVersionText  "7.1.2"
 #define MagickLibVersionNumber  10,0,2
-#define MagickLibAddendum  "-0"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "x86_64"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-0"
+#define MagickppLibAddendum  "-1"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-07-12"
+#define MagickReleaseDate  "2025-08-11"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-0/configs/x86/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-1/configs/x86/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-0/configs/x86/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-1/configs/x86/MagickCore/magick-baseconfig.h
index f69f16713..9819965eb 100644
--- a/ImageMagick-7.1.2-0/configs/x86/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-1/configs/x86/MagickCore/magick-baseconfig.h
@@ -1203,7 +1203,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-0"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-1"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -1218,7 +1218,7 @@
 
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "7.1.2-0"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-0"
+#define MAGICKCORE_VERSION "7.1.2-1"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-0/configs/x86/MagickCore/version.h b/ImageMagick-7.1.2-1/configs/x86/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-0/configs/x86/MagickCore/version.h
rename to ImageMagick-7.1.2-1/configs/x86/MagickCore/version.h
index 54759b63e..2b018421e 100644
--- a/ImageMagick-7.1.2-0/configs/x86/MagickCore/version.h
+++ b/ImageMagick-7.1.2-1/configs/x86/MagickCore/version.h
@@ -30,16 +30,16 @@ extern "C" {
 #define MagickLibVersion  0x712
 #define MagickLibVersionText  "7.1.2"
 #define MagickLibVersionNumber  10,0,2
-#define MagickLibAddendum  "-0"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "x86"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-0"
+#define MagickppLibAddendum  "-1"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-07-12"
+#define MagickReleaseDate  "2025-08-11"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-0/filters/analyze.c b/ImageMagick-7.1.2-1/filters/analyze.c
similarity index 100%
rename from ImageMagick-7.1.2-0/filters/analyze.c
rename to ImageMagick-7.1.2-1/filters/analyze.c
diff --git a/ImageMagick-7.1.2-0/oss-fuzz/encoder_format.h b/ImageMagick-7.1.2-1/oss-fuzz/encoder_format.h
similarity index 100%
rename from ImageMagick-7.1.2-0/oss-fuzz/encoder_format.h
rename to ImageMagick-7.1.2-1/oss-fuzz/encoder_format.h
diff --git a/ImageMagick-7.1.2-0/utilities/magick.c b/ImageMagick-7.1.2-1/utilities/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-0/utilities/magick.c
rename to ImageMagick-7.1.2-1/utilities/magick.c
diff --git a/README.md b/README.md
index 43263708d..fcc9757e5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# Android ImageMagick 7.1.2-0
+# Android ImageMagick 7.1.2-1
 
 [![Build](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/build.yml/badge.svg)](https://github.com/MolotovCherry//Android-ImageMagick7/actions/workflows/build.yml) [![CodeQL](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/codeql-analysis.yml) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/MolotovCherry/Android-ImageMagick7?style=plastic)
 
diff --git a/make/libmagickcore-7.mk b/make/libmagickcore-7.mk
index e3ab7f6d5..bad467c11 100644
--- a/make/libmagickcore-7.mk
+++ b/make/libmagickcore-7.mk
@@ -157,6 +157,7 @@ LOCAL_SRC_FILES += \
     $(IMAGE_MAGICK)/coders/scr.c \
     $(IMAGE_MAGICK)/coders/screenshot.c \
     $(IMAGE_MAGICK)/coders/sct.c \
+    $(IMAGE_MAGICK)/coders/sf3.c \
     $(IMAGE_MAGICK)/coders/sfw.c \
     $(IMAGE_MAGICK)/coders/sgi.c \
     $(IMAGE_MAGICK)/coders/sixel.c \