diff --git a/Android.mk b/Android.mk
index 2a050c306..f6c5a9efc 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-3
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.2-4
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Blob.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Blob.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Blob.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Blob.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/BlobRef.cpp b/ImageMagick-7.1.2-4/Magick++/lib/BlobRef.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/BlobRef.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/BlobRef.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/CoderInfo.cpp b/ImageMagick-7.1.2-4/Magick++/lib/CoderInfo.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/CoderInfo.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/CoderInfo.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Color.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Color.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Color.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Color.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Drawable.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Drawable.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Drawable.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Drawable.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Exception.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Exception.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Exception.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Exception.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Functions.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Functions.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Functions.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Functions.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Geometry.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Geometry.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Geometry.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Geometry.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Image.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Image.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Image.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Image.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/ImageRef.cpp b/ImageMagick-7.1.2-4/Magick++/lib/ImageRef.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/ImageRef.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/ImageRef.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Blob.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Blob.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Blob.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Blob.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/BlobRef.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/BlobRef.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/BlobRef.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/BlobRef.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/CoderInfo.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/CoderInfo.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/CoderInfo.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/CoderInfo.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Color.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Color.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Color.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Color.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Drawable.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Drawable.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Drawable.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Drawable.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Exception.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Exception.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Exception.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Exception.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Functions.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Functions.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Functions.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Functions.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Geometry.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Geometry.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Geometry.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Geometry.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Image.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Image.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Image.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Image.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/ImageRef.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/ImageRef.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/ImageRef.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/ImageRef.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Include.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Include.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Include.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Include.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Montage.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Montage.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Montage.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Montage.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Options.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Options.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Options.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Options.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Pixels.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Pixels.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Pixels.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Pixels.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/ResourceLimits.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/ResourceLimits.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/ResourceLimits.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/ResourceLimits.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/STL.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/STL.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/STL.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/STL.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/SecurityPolicy.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/SecurityPolicy.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/SecurityPolicy.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/SecurityPolicy.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Statistic.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Statistic.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Statistic.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Statistic.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/Thread.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/Thread.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/Thread.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/Thread.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Magick++/TypeMetric.h b/ImageMagick-7.1.2-4/Magick++/lib/Magick++/TypeMetric.h
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Magick++/TypeMetric.h
rename to ImageMagick-7.1.2-4/Magick++/lib/Magick++/TypeMetric.h
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Montage.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Montage.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Montage.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Montage.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Options.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Options.cpp
similarity index 99%
rename from ImageMagick-7.1.2-3/Magick++/lib/Options.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Options.cpp
index 5d5724c96..c25604558 100644
--- a/ImageMagick-7.1.2-3/Magick++/lib/Options.cpp
+++ b/ImageMagick-7.1.2-4/Magick++/lib/Options.cpp
@@ -592,9 +592,8 @@ void Magick::Options::strokeDashArray(const double *strokeDashArray_)
     {
       size_t
         x;
-      // Count elements in dash array
-      for (x=0; strokeDashArray_[x]; x++) ;
-      // Allocate elements
+
+      for (x=0; fabs(strokeDashArray_[x]) >= MagickEpsilon; x++) ;
       _drawInfo->dash_pattern=static_cast<double*>(AcquireMagickMemory((x+1)*
         sizeof(double)));
       if (!_drawInfo->dash_pattern)
@@ -602,8 +601,8 @@ void Magick::Options::strokeDashArray(const double *strokeDashArray_)
           "Unable to allocate dash-pattern memory");
       else
         {
-          // Copy elements
-          memcpy(_drawInfo->dash_pattern,strokeDashArray_,(x+1)*sizeof(double));
+          (void) memset(_drawInfo->dash_pattern,0,(size_t) (x+1)*sizeof(double));
+          memcpy(_drawInfo->dash_pattern,strokeDashArray_,x*sizeof(double));
           _drawInfo->dash_pattern[x]=0.0;
         }
     }
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Pixels.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Pixels.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Pixels.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/ResourceLimits.cpp b/ImageMagick-7.1.2-4/Magick++/lib/ResourceLimits.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/ResourceLimits.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/ResourceLimits.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/STL.cpp b/ImageMagick-7.1.2-4/Magick++/lib/STL.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/STL.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/STL.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/SecurityPolicy.cpp b/ImageMagick-7.1.2-4/Magick++/lib/SecurityPolicy.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/SecurityPolicy.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/SecurityPolicy.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Statistic.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Statistic.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Statistic.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Statistic.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/Thread.cpp b/ImageMagick-7.1.2-4/Magick++/lib/Thread.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/Thread.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/Thread.cpp
diff --git a/ImageMagick-7.1.2-3/Magick++/lib/TypeMetric.cpp b/ImageMagick-7.1.2-4/Magick++/lib/TypeMetric.cpp
similarity index 100%
rename from ImageMagick-7.1.2-3/Magick++/lib/TypeMetric.cpp
rename to ImageMagick-7.1.2-4/Magick++/lib/TypeMetric.cpp
diff --git a/ImageMagick-7.1.2-3/MagickCore/MagickCore.h b/ImageMagick-7.1.2-4/MagickCore/MagickCore.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/MagickCore.h
rename to ImageMagick-7.1.2-4/MagickCore/MagickCore.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/accelerate-kernels-private.h b/ImageMagick-7.1.2-4/MagickCore/accelerate-kernels-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/accelerate-kernels-private.h
rename to ImageMagick-7.1.2-4/MagickCore/accelerate-kernels-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/accelerate-private.h b/ImageMagick-7.1.2-4/MagickCore/accelerate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/accelerate-private.h
rename to ImageMagick-7.1.2-4/MagickCore/accelerate-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/accelerate.c b/ImageMagick-7.1.2-4/MagickCore/accelerate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/accelerate.c
rename to ImageMagick-7.1.2-4/MagickCore/accelerate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/animate-private.h b/ImageMagick-7.1.2-4/MagickCore/animate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/animate-private.h
rename to ImageMagick-7.1.2-4/MagickCore/animate-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/animate.c b/ImageMagick-7.1.2-4/MagickCore/animate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/animate.c
rename to ImageMagick-7.1.2-4/MagickCore/animate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/animate.h b/ImageMagick-7.1.2-4/MagickCore/animate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/animate.h
rename to ImageMagick-7.1.2-4/MagickCore/animate.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/annotate-private.h b/ImageMagick-7.1.2-4/MagickCore/annotate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/annotate-private.h
rename to ImageMagick-7.1.2-4/MagickCore/annotate-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/annotate.c b/ImageMagick-7.1.2-4/MagickCore/annotate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/annotate.c
rename to ImageMagick-7.1.2-4/MagickCore/annotate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/annotate.h b/ImageMagick-7.1.2-4/MagickCore/annotate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/annotate.h
rename to ImageMagick-7.1.2-4/MagickCore/annotate.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/artifact.c b/ImageMagick-7.1.2-4/MagickCore/artifact.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/artifact.c
rename to ImageMagick-7.1.2-4/MagickCore/artifact.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/artifact.h b/ImageMagick-7.1.2-4/MagickCore/artifact.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/artifact.h
rename to ImageMagick-7.1.2-4/MagickCore/artifact.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/attribute.c b/ImageMagick-7.1.2-4/MagickCore/attribute.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/attribute.c
rename to ImageMagick-7.1.2-4/MagickCore/attribute.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/attribute.h b/ImageMagick-7.1.2-4/MagickCore/attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/attribute.h
rename to ImageMagick-7.1.2-4/MagickCore/attribute.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/blob-private.h b/ImageMagick-7.1.2-4/MagickCore/blob-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/blob-private.h
rename to ImageMagick-7.1.2-4/MagickCore/blob-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/blob.c b/ImageMagick-7.1.2-4/MagickCore/blob.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/blob.c
rename to ImageMagick-7.1.2-4/MagickCore/blob.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/blob.h b/ImageMagick-7.1.2-4/MagickCore/blob.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/blob.h
rename to ImageMagick-7.1.2-4/MagickCore/blob.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/cache-private.h b/ImageMagick-7.1.2-4/MagickCore/cache-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cache-private.h
rename to ImageMagick-7.1.2-4/MagickCore/cache-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/cache-view.c b/ImageMagick-7.1.2-4/MagickCore/cache-view.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cache-view.c
rename to ImageMagick-7.1.2-4/MagickCore/cache-view.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/cache-view.h b/ImageMagick-7.1.2-4/MagickCore/cache-view.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cache-view.h
rename to ImageMagick-7.1.2-4/MagickCore/cache-view.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/cache.c b/ImageMagick-7.1.2-4/MagickCore/cache.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cache.c
rename to ImageMagick-7.1.2-4/MagickCore/cache.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/cache.h b/ImageMagick-7.1.2-4/MagickCore/cache.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cache.h
rename to ImageMagick-7.1.2-4/MagickCore/cache.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/channel.c b/ImageMagick-7.1.2-4/MagickCore/channel.c
similarity index 98%
rename from ImageMagick-7.1.2-3/MagickCore/channel.c
rename to ImageMagick-7.1.2-4/MagickCore/channel.c
index 6ffe80469..8b1fe41ce 100644
--- a/ImageMagick-7.1.2-3/MagickCore/channel.c
+++ b/ImageMagick-7.1.2-4/MagickCore/channel.c
@@ -512,6 +512,9 @@ MagickExport Image *CombineImages(const Image *image,
   MagickOffsetType
     progress;
 
+  size_t
+    number_channels;
+
   ssize_t
     y;
 
@@ -539,26 +542,33 @@ MagickExport Image *CombineImages(const Image *image,
       (void) SetImageColorspace(combine_image,RGBColorspace,exception);
     else
       (void) SetImageColorspace(combine_image,sRGBColorspace,exception);
+  number_channels=GetImageListLength(image);
   switch (combine_image->colorspace)
   {
     case UndefinedColorspace:
     case sRGBColorspace:
     {
-      if (GetImageListLength(image) > 3)
+      if (number_channels > 3)
         combine_image->alpha_trait=BlendPixelTrait;
+      if (number_channels > 4)
+        SetPixelMetaChannels(combine_image,number_channels-4,exception);
       break;
     }
     case LinearGRAYColorspace:
     case GRAYColorspace:
     {
-      if (GetImageListLength(image) > 1)
+      if (number_channels > 1)
         combine_image->alpha_trait=BlendPixelTrait;
+      if (number_channels > 2)
+        SetPixelMetaChannels(combine_image,number_channels-2,exception);
       break;
     }
     case CMYKColorspace:
     {
-      if (GetImageListLength(image) > 4)
+      if (number_channels > 4)
         combine_image->alpha_trait=BlendPixelTrait;
+      if (number_channels > 5)
+        SetPixelMetaChannels(combine_image,number_channels-5,exception);
       break;
     }
     default:
diff --git a/ImageMagick-7.1.2-3/MagickCore/channel.h b/ImageMagick-7.1.2-4/MagickCore/channel.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/channel.h
rename to ImageMagick-7.1.2-4/MagickCore/channel.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/cipher.c b/ImageMagick-7.1.2-4/MagickCore/cipher.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cipher.c
rename to ImageMagick-7.1.2-4/MagickCore/cipher.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/cipher.h b/ImageMagick-7.1.2-4/MagickCore/cipher.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/cipher.h
rename to ImageMagick-7.1.2-4/MagickCore/cipher.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/client.c b/ImageMagick-7.1.2-4/MagickCore/client.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/client.c
rename to ImageMagick-7.1.2-4/MagickCore/client.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/client.h b/ImageMagick-7.1.2-4/MagickCore/client.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/client.h
rename to ImageMagick-7.1.2-4/MagickCore/client.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/coder-private.h b/ImageMagick-7.1.2-4/MagickCore/coder-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/coder-private.h
rename to ImageMagick-7.1.2-4/MagickCore/coder-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/coder.c b/ImageMagick-7.1.2-4/MagickCore/coder.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/coder.c
rename to ImageMagick-7.1.2-4/MagickCore/coder.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/coder.h b/ImageMagick-7.1.2-4/MagickCore/coder.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/coder.h
rename to ImageMagick-7.1.2-4/MagickCore/coder.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/color-private.h b/ImageMagick-7.1.2-4/MagickCore/color-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/color-private.h
rename to ImageMagick-7.1.2-4/MagickCore/color-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/color.c b/ImageMagick-7.1.2-4/MagickCore/color.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/color.c
rename to ImageMagick-7.1.2-4/MagickCore/color.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/color.h b/ImageMagick-7.1.2-4/MagickCore/color.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/color.h
rename to ImageMagick-7.1.2-4/MagickCore/color.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/colormap-private.h b/ImageMagick-7.1.2-4/MagickCore/colormap-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colormap-private.h
rename to ImageMagick-7.1.2-4/MagickCore/colormap-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/colormap.c b/ImageMagick-7.1.2-4/MagickCore/colormap.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colormap.c
rename to ImageMagick-7.1.2-4/MagickCore/colormap.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/colormap.h b/ImageMagick-7.1.2-4/MagickCore/colormap.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colormap.h
rename to ImageMagick-7.1.2-4/MagickCore/colormap.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/colorspace-private.h b/ImageMagick-7.1.2-4/MagickCore/colorspace-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colorspace-private.h
rename to ImageMagick-7.1.2-4/MagickCore/colorspace-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/colorspace.c b/ImageMagick-7.1.2-4/MagickCore/colorspace.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colorspace.c
rename to ImageMagick-7.1.2-4/MagickCore/colorspace.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/colorspace.h b/ImageMagick-7.1.2-4/MagickCore/colorspace.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/colorspace.h
rename to ImageMagick-7.1.2-4/MagickCore/colorspace.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/compare-private.h b/ImageMagick-7.1.2-4/MagickCore/compare-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/compare-private.h
rename to ImageMagick-7.1.2-4/MagickCore/compare-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/compare.c b/ImageMagick-7.1.2-4/MagickCore/compare.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/compare.c
rename to ImageMagick-7.1.2-4/MagickCore/compare.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/compare.h b/ImageMagick-7.1.2-4/MagickCore/compare.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/compare.h
rename to ImageMagick-7.1.2-4/MagickCore/compare.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/composite-private.h b/ImageMagick-7.1.2-4/MagickCore/composite-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/composite-private.h
rename to ImageMagick-7.1.2-4/MagickCore/composite-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/composite.c b/ImageMagick-7.1.2-4/MagickCore/composite.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/composite.c
rename to ImageMagick-7.1.2-4/MagickCore/composite.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/composite.h b/ImageMagick-7.1.2-4/MagickCore/composite.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/composite.h
rename to ImageMagick-7.1.2-4/MagickCore/composite.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/compress.c b/ImageMagick-7.1.2-4/MagickCore/compress.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/compress.c
rename to ImageMagick-7.1.2-4/MagickCore/compress.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/compress.h b/ImageMagick-7.1.2-4/MagickCore/compress.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/compress.h
rename to ImageMagick-7.1.2-4/MagickCore/compress.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/configure-private.h b/ImageMagick-7.1.2-4/MagickCore/configure-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/configure-private.h
rename to ImageMagick-7.1.2-4/MagickCore/configure-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/configure.c b/ImageMagick-7.1.2-4/MagickCore/configure.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/configure.c
rename to ImageMagick-7.1.2-4/MagickCore/configure.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/configure.h b/ImageMagick-7.1.2-4/MagickCore/configure.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/configure.h
rename to ImageMagick-7.1.2-4/MagickCore/configure.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/constitute-private.h b/ImageMagick-7.1.2-4/MagickCore/constitute-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/constitute-private.h
rename to ImageMagick-7.1.2-4/MagickCore/constitute-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/constitute.c b/ImageMagick-7.1.2-4/MagickCore/constitute.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/constitute.c
rename to ImageMagick-7.1.2-4/MagickCore/constitute.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/constitute.h b/ImageMagick-7.1.2-4/MagickCore/constitute.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/constitute.h
rename to ImageMagick-7.1.2-4/MagickCore/constitute.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/decorate.c b/ImageMagick-7.1.2-4/MagickCore/decorate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/decorate.c
rename to ImageMagick-7.1.2-4/MagickCore/decorate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/decorate.h b/ImageMagick-7.1.2-4/MagickCore/decorate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/decorate.h
rename to ImageMagick-7.1.2-4/MagickCore/decorate.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/delegate-private.h b/ImageMagick-7.1.2-4/MagickCore/delegate-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/delegate-private.h
rename to ImageMagick-7.1.2-4/MagickCore/delegate-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/delegate.c b/ImageMagick-7.1.2-4/MagickCore/delegate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/delegate.c
rename to ImageMagick-7.1.2-4/MagickCore/delegate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/delegate.h b/ImageMagick-7.1.2-4/MagickCore/delegate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/delegate.h
rename to ImageMagick-7.1.2-4/MagickCore/delegate.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/deprecate.c b/ImageMagick-7.1.2-4/MagickCore/deprecate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/deprecate.c
rename to ImageMagick-7.1.2-4/MagickCore/deprecate.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/deprecate.h b/ImageMagick-7.1.2-4/MagickCore/deprecate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/deprecate.h
rename to ImageMagick-7.1.2-4/MagickCore/deprecate.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/display-private.h b/ImageMagick-7.1.2-4/MagickCore/display-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/display-private.h
rename to ImageMagick-7.1.2-4/MagickCore/display-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/display.c b/ImageMagick-7.1.2-4/MagickCore/display.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/display.c
rename to ImageMagick-7.1.2-4/MagickCore/display.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/display.h b/ImageMagick-7.1.2-4/MagickCore/display.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/display.h
rename to ImageMagick-7.1.2-4/MagickCore/display.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/distort.c b/ImageMagick-7.1.2-4/MagickCore/distort.c
similarity index 99%
rename from ImageMagick-7.1.2-3/MagickCore/distort.c
rename to ImageMagick-7.1.2-4/MagickCore/distort.c
index b01adb53f..8697f6617 100644
--- a/ImageMagick-7.1.2-3/MagickCore/distort.c
+++ b/ImageMagick-7.1.2-4/MagickCore/distort.c
@@ -1966,8 +1966,10 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method,
         geometry.width = (size_t) ceil((coeff[0]-coeff[1])*
           (coeff[5]-coeff[4])*0.5);
         /* correct scaling factors relative to new size */
-        coeff[6]=(coeff[5]-coeff[4]) * (double) geometry.width; /* changed width */
-        coeff[7]=(coeff[0]-coeff[1]) * (double) geometry.height; /* should be about 1.0 */
+        coeff[6]=(coeff[5]-coeff[4]) * MagickSafeReciprocal(
+          (double) geometry.width); /* changed width */
+        coeff[7]=(coeff[0]-coeff[1]) * MagickSafeReciprocal(
+          (double) geometry.height); /* should be about 1.0 */
         break;
       }
       case Cylinder2PlaneDistortion:
diff --git a/ImageMagick-7.1.2-3/MagickCore/distort.h b/ImageMagick-7.1.2-4/MagickCore/distort.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/distort.h
rename to ImageMagick-7.1.2-4/MagickCore/distort.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/distribute-cache-private.h b/ImageMagick-7.1.2-4/MagickCore/distribute-cache-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/distribute-cache-private.h
rename to ImageMagick-7.1.2-4/MagickCore/distribute-cache-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/distribute-cache.c b/ImageMagick-7.1.2-4/MagickCore/distribute-cache.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/distribute-cache.c
rename to ImageMagick-7.1.2-4/MagickCore/distribute-cache.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/distribute-cache.h b/ImageMagick-7.1.2-4/MagickCore/distribute-cache.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/distribute-cache.h
rename to ImageMagick-7.1.2-4/MagickCore/distribute-cache.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/draw-private.h b/ImageMagick-7.1.2-4/MagickCore/draw-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/draw-private.h
rename to ImageMagick-7.1.2-4/MagickCore/draw-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/draw.c b/ImageMagick-7.1.2-4/MagickCore/draw.c
similarity index 99%
rename from ImageMagick-7.1.2-3/MagickCore/draw.c
rename to ImageMagick-7.1.2-4/MagickCore/draw.c
index d9f3504cd..99f00d2f8 100644
--- a/ImageMagick-7.1.2-3/MagickCore/draw.c
+++ b/ImageMagick-7.1.2-4/MagickCore/draw.c
@@ -341,15 +341,15 @@ MagickExport DrawInfo *CloneDrawInfo(const ImageInfo *image_info,
         x;
 
       for (x=0; fabs(draw_info->dash_pattern[x]) >= MagickEpsilon; x++) ;
-      clone_info->dash_pattern=(double *) AcquireQuantumMemory((size_t) (2*x+2),
+      clone_info->dash_pattern=(double *) AcquireQuantumMemory((size_t) (x+1),
         sizeof(*clone_info->dash_pattern));
       if (clone_info->dash_pattern == (double *) NULL)
         ThrowFatalException(ResourceLimitFatalError,
           "UnableToAllocateDashPattern");
-      (void) memset(clone_info->dash_pattern,0,(size_t) (2*x+2)*
+      (void) memset(clone_info->dash_pattern,0,(size_t) (x+1)*
         sizeof(*clone_info->dash_pattern));
       (void) memcpy(clone_info->dash_pattern,draw_info->dash_pattern,(size_t)
-        (x+1)*sizeof(*clone_info->dash_pattern));
+        x*sizeof(*clone_info->dash_pattern));
     }
   clone_info->gradient=draw_info->gradient;
   if (draw_info->gradient.stops != (StopInfo *) NULL)
diff --git a/ImageMagick-7.1.2-3/MagickCore/draw.h b/ImageMagick-7.1.2-4/MagickCore/draw.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/draw.h
rename to ImageMagick-7.1.2-4/MagickCore/draw.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/effect.c b/ImageMagick-7.1.2-4/MagickCore/effect.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/effect.c
rename to ImageMagick-7.1.2-4/MagickCore/effect.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/effect.h b/ImageMagick-7.1.2-4/MagickCore/effect.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/effect.h
rename to ImageMagick-7.1.2-4/MagickCore/effect.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/enhance.c b/ImageMagick-7.1.2-4/MagickCore/enhance.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/enhance.c
rename to ImageMagick-7.1.2-4/MagickCore/enhance.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/enhance.h b/ImageMagick-7.1.2-4/MagickCore/enhance.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/enhance.h
rename to ImageMagick-7.1.2-4/MagickCore/enhance.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/exception-private.h b/ImageMagick-7.1.2-4/MagickCore/exception-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/exception-private.h
rename to ImageMagick-7.1.2-4/MagickCore/exception-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/exception.c b/ImageMagick-7.1.2-4/MagickCore/exception.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/exception.c
rename to ImageMagick-7.1.2-4/MagickCore/exception.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/exception.h b/ImageMagick-7.1.2-4/MagickCore/exception.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/exception.h
rename to ImageMagick-7.1.2-4/MagickCore/exception.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/feature.c b/ImageMagick-7.1.2-4/MagickCore/feature.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/feature.c
rename to ImageMagick-7.1.2-4/MagickCore/feature.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/feature.h b/ImageMagick-7.1.2-4/MagickCore/feature.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/feature.h
rename to ImageMagick-7.1.2-4/MagickCore/feature.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/fourier.c b/ImageMagick-7.1.2-4/MagickCore/fourier.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/fourier.c
rename to ImageMagick-7.1.2-4/MagickCore/fourier.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/fourier.h b/ImageMagick-7.1.2-4/MagickCore/fourier.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/fourier.h
rename to ImageMagick-7.1.2-4/MagickCore/fourier.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/fx-private.h b/ImageMagick-7.1.2-4/MagickCore/fx-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/fx-private.h
rename to ImageMagick-7.1.2-4/MagickCore/fx-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/fx.c b/ImageMagick-7.1.2-4/MagickCore/fx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/fx.c
rename to ImageMagick-7.1.2-4/MagickCore/fx.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/fx.h b/ImageMagick-7.1.2-4/MagickCore/fx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/fx.h
rename to ImageMagick-7.1.2-4/MagickCore/fx.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/gem-private.h b/ImageMagick-7.1.2-4/MagickCore/gem-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/gem-private.h
rename to ImageMagick-7.1.2-4/MagickCore/gem-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/gem.c b/ImageMagick-7.1.2-4/MagickCore/gem.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/gem.c
rename to ImageMagick-7.1.2-4/MagickCore/gem.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/gem.h b/ImageMagick-7.1.2-4/MagickCore/gem.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/gem.h
rename to ImageMagick-7.1.2-4/MagickCore/gem.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/geometry-private.h b/ImageMagick-7.1.2-4/MagickCore/geometry-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/geometry-private.h
rename to ImageMagick-7.1.2-4/MagickCore/geometry-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/geometry.c b/ImageMagick-7.1.2-4/MagickCore/geometry.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/geometry.c
rename to ImageMagick-7.1.2-4/MagickCore/geometry.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/geometry.h b/ImageMagick-7.1.2-4/MagickCore/geometry.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/geometry.h
rename to ImageMagick-7.1.2-4/MagickCore/geometry.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/histogram.c b/ImageMagick-7.1.2-4/MagickCore/histogram.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/histogram.c
rename to ImageMagick-7.1.2-4/MagickCore/histogram.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/histogram.h b/ImageMagick-7.1.2-4/MagickCore/histogram.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/histogram.h
rename to ImageMagick-7.1.2-4/MagickCore/histogram.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/identify.c b/ImageMagick-7.1.2-4/MagickCore/identify.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/identify.c
rename to ImageMagick-7.1.2-4/MagickCore/identify.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/identify.h b/ImageMagick-7.1.2-4/MagickCore/identify.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/identify.h
rename to ImageMagick-7.1.2-4/MagickCore/identify.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/image-private.h b/ImageMagick-7.1.2-4/MagickCore/image-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/image-private.h
rename to ImageMagick-7.1.2-4/MagickCore/image-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/image-view.c b/ImageMagick-7.1.2-4/MagickCore/image-view.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/image-view.c
rename to ImageMagick-7.1.2-4/MagickCore/image-view.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/image-view.h b/ImageMagick-7.1.2-4/MagickCore/image-view.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/image-view.h
rename to ImageMagick-7.1.2-4/MagickCore/image-view.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/image.c b/ImageMagick-7.1.2-4/MagickCore/image.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/image.c
rename to ImageMagick-7.1.2-4/MagickCore/image.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/image.h b/ImageMagick-7.1.2-4/MagickCore/image.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/image.h
rename to ImageMagick-7.1.2-4/MagickCore/image.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/layer.c b/ImageMagick-7.1.2-4/MagickCore/layer.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/layer.c
rename to ImageMagick-7.1.2-4/MagickCore/layer.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/layer.h b/ImageMagick-7.1.2-4/MagickCore/layer.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/layer.h
rename to ImageMagick-7.1.2-4/MagickCore/layer.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/linked-list-private.h b/ImageMagick-7.1.2-4/MagickCore/linked-list-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/linked-list-private.h
rename to ImageMagick-7.1.2-4/MagickCore/linked-list-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/linked-list.c b/ImageMagick-7.1.2-4/MagickCore/linked-list.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/linked-list.c
rename to ImageMagick-7.1.2-4/MagickCore/linked-list.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/linked-list.h b/ImageMagick-7.1.2-4/MagickCore/linked-list.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/linked-list.h
rename to ImageMagick-7.1.2-4/MagickCore/linked-list.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/list.c b/ImageMagick-7.1.2-4/MagickCore/list.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/list.c
rename to ImageMagick-7.1.2-4/MagickCore/list.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/list.h b/ImageMagick-7.1.2-4/MagickCore/list.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/list.h
rename to ImageMagick-7.1.2-4/MagickCore/list.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/locale-private.h b/ImageMagick-7.1.2-4/MagickCore/locale-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/locale-private.h
rename to ImageMagick-7.1.2-4/MagickCore/locale-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/locale.c b/ImageMagick-7.1.2-4/MagickCore/locale.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/locale.c
rename to ImageMagick-7.1.2-4/MagickCore/locale.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/locale_.h b/ImageMagick-7.1.2-4/MagickCore/locale_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/locale_.h
rename to ImageMagick-7.1.2-4/MagickCore/locale_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/log-private.h b/ImageMagick-7.1.2-4/MagickCore/log-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/log-private.h
rename to ImageMagick-7.1.2-4/MagickCore/log-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/log.c b/ImageMagick-7.1.2-4/MagickCore/log.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/log.c
rename to ImageMagick-7.1.2-4/MagickCore/log.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/log.h b/ImageMagick-7.1.2-4/MagickCore/log.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/log.h
rename to ImageMagick-7.1.2-4/MagickCore/log.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magic-private.h b/ImageMagick-7.1.2-4/MagickCore/magic-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magic-private.h
rename to ImageMagick-7.1.2-4/MagickCore/magic-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magic.c b/ImageMagick-7.1.2-4/MagickCore/magic.c
similarity index 99%
rename from ImageMagick-7.1.2-3/MagickCore/magic.c
rename to ImageMagick-7.1.2-4/MagickCore/magic.c
index a49724632..eebe256be 100644
--- a/ImageMagick-7.1.2-3/MagickCore/magic.c
+++ b/ImageMagick-7.1.2-4/MagickCore/magic.c
@@ -472,7 +472,7 @@ static int MagicInfoCompare(const void *x,const void *y)
 #endif
 
 MagickExport const MagicInfo **GetMagicInfoList(const char *pattern,
-  size_t *number_aliases,ExceptionInfo *magick_unused(exception))
+  size_t *number_aliases,ExceptionInfo *exception)
 {
   const MagicInfo
     **aliases;
@@ -489,7 +489,7 @@ MagickExport const MagicInfo **GetMagicInfoList(const char *pattern,
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern);
   *number_aliases=0;
-  if (IsMagicCacheInstantiated() == MagickFalse)
+  if (IsMagicListInstantiated(exception) == MagickFalse)
     return((const MagicInfo **) NULL);
   aliases=(const MagicInfo **) AcquireQuantumMemory((size_t)
     GetNumberOfElementsInLinkedList(magic_list)+1UL,sizeof(*aliases));
@@ -569,7 +569,7 @@ static int MagicCompare(const void *x,const void *y)
 #endif
 
 MagickExport char **GetMagicList(const char *pattern,size_t *number_aliases,
-  ExceptionInfo *magick_unused(exception))
+  ExceptionInfo *exception)
 {
   char
     **aliases;
@@ -586,7 +586,7 @@ MagickExport char **GetMagicList(const char *pattern,size_t *number_aliases,
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern);
   *number_aliases=0;
-  if (IsMagicCacheInstantiated() == MagickFalse)
+  if (IsMagicListInstantiated(exception) == MagickFalse)
     return((char **) NULL);
   aliases=(char **) AcquireQuantumMemory((size_t)
     GetNumberOfElementsInLinkedList(magic_list)+1UL,sizeof(*aliases));
diff --git a/ImageMagick-7.1.2-3/MagickCore/magic.h b/ImageMagick-7.1.2-4/MagickCore/magic.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magic.h
rename to ImageMagick-7.1.2-4/MagickCore/magic.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magick-config.h b/ImageMagick-7.1.2-4/MagickCore/magick-config.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magick-config.h
rename to ImageMagick-7.1.2-4/MagickCore/magick-config.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magick-private.h b/ImageMagick-7.1.2-4/MagickCore/magick-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magick-private.h
rename to ImageMagick-7.1.2-4/MagickCore/magick-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magick-type.h b/ImageMagick-7.1.2-4/MagickCore/magick-type.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magick-type.h
rename to ImageMagick-7.1.2-4/MagickCore/magick-type.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/magick.c b/ImageMagick-7.1.2-4/MagickCore/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magick.c
rename to ImageMagick-7.1.2-4/MagickCore/magick.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/magick.h b/ImageMagick-7.1.2-4/MagickCore/magick.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/magick.h
rename to ImageMagick-7.1.2-4/MagickCore/magick.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/matrix-private.h b/ImageMagick-7.1.2-4/MagickCore/matrix-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/matrix-private.h
rename to ImageMagick-7.1.2-4/MagickCore/matrix-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/matrix.c b/ImageMagick-7.1.2-4/MagickCore/matrix.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/matrix.c
rename to ImageMagick-7.1.2-4/MagickCore/matrix.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/matrix.h b/ImageMagick-7.1.2-4/MagickCore/matrix.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/matrix.h
rename to ImageMagick-7.1.2-4/MagickCore/matrix.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/memory-private.h b/ImageMagick-7.1.2-4/MagickCore/memory-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/memory-private.h
rename to ImageMagick-7.1.2-4/MagickCore/memory-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/memory.c b/ImageMagick-7.1.2-4/MagickCore/memory.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/memory.c
rename to ImageMagick-7.1.2-4/MagickCore/memory.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/memory_.h b/ImageMagick-7.1.2-4/MagickCore/memory_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/memory_.h
rename to ImageMagick-7.1.2-4/MagickCore/memory_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/method-attribute.h b/ImageMagick-7.1.2-4/MagickCore/method-attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/method-attribute.h
rename to ImageMagick-7.1.2-4/MagickCore/method-attribute.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/methods.h b/ImageMagick-7.1.2-4/MagickCore/methods.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/methods.h
rename to ImageMagick-7.1.2-4/MagickCore/methods.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/mime-private.h b/ImageMagick-7.1.2-4/MagickCore/mime-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/mime-private.h
rename to ImageMagick-7.1.2-4/MagickCore/mime-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/mime.c b/ImageMagick-7.1.2-4/MagickCore/mime.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/mime.c
rename to ImageMagick-7.1.2-4/MagickCore/mime.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/mime.h b/ImageMagick-7.1.2-4/MagickCore/mime.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/mime.h
rename to ImageMagick-7.1.2-4/MagickCore/mime.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/module-private.h b/ImageMagick-7.1.2-4/MagickCore/module-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/module-private.h
rename to ImageMagick-7.1.2-4/MagickCore/module-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/module.c b/ImageMagick-7.1.2-4/MagickCore/module.c
similarity index 98%
rename from ImageMagick-7.1.2-3/MagickCore/module.c
rename to ImageMagick-7.1.2-4/MagickCore/module.c
index e36214d23..a981809e4 100644
--- a/ImageMagick-7.1.2-3/MagickCore/module.c
+++ b/ImageMagick-7.1.2-4/MagickCore/module.c
@@ -78,11 +78,14 @@ typedef void *ModuleHandle;
   Define declarations.
 */
 #if defined(MAGICKCORE_LTDL_DELEGATE)
+#  define FilterGlobExpression "*.la"
 #  define ModuleGlobExpression "*.la"
 #else
 #  if defined(_DEBUG)
+#    define FilterGlobExpression "FILTER_DB_*.dll"
 #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
 #  else
+#    define FilterGlobExpression "FILTER_RL_*.dll"
 #    define ModuleGlobExpression "IM_MOD_RL_*.dll"
 #  endif
 #endif
@@ -454,7 +457,10 @@ MagickExport char **GetModuleList(const char *pattern,
   while ((MagickReadDirectory(directory,buffer,&entry) == 0) &&
          (entry != (struct dirent *) NULL))
   {
-    status=GlobExpression(entry->d_name,ModuleGlobExpression,MagickFalse);
+    if (type == MagickImageFilterModule)
+      status=GlobExpression(entry->d_name,FilterGlobExpression,MagickFalse);
+    else
+      status=GlobExpression(entry->d_name,ModuleGlobExpression,MagickFalse);
     if (status == MagickFalse)
       continue;
     if (GlobExpression(entry->d_name,pattern,MagickFalse) == MagickFalse)
@@ -479,6 +485,11 @@ MagickExport char **GetModuleList(const char *pattern,
         (void) CopyMagickString(modules[i],modules[i]+10,MagickPathExtent);
         modules[i][strlen(modules[i])-1]='\0';
       }
+    else if (LocaleNCompare("FILTER_",modules[i],7) == 0)
+      {
+        (void) CopyMagickString(modules[i],modules[i]+10,MagickPathExtent);
+        modules[i][strlen(modules[i])-1]='\0';
+      }
     i++;
   }
   buffer=(struct dirent *) RelinquishMagickMemory(buffer);
@@ -1525,7 +1536,11 @@ static void TagToFilterModuleName(const char *tag,char *name)
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-  (void) FormatLocaleString(name,MagickPathExtent,"FILTER_%s_.dll",tag);
+#if defined(_DEBUG)
+ (void) FormatLocaleString(name,MagickPathExtent,"FILTER_DB_%s_.dll",tag);
+#else
+ (void) FormatLocaleString(name,MagickPathExtent,"FILTER_RL_%s_.dll",tag);
+#endif
 #elif !defined(MAGICKCORE_LTDL_DELEGATE)
   (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag);
 #else
diff --git a/ImageMagick-7.1.2-3/MagickCore/module.h b/ImageMagick-7.1.2-4/MagickCore/module.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/module.h
rename to ImageMagick-7.1.2-4/MagickCore/module.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/monitor-private.h b/ImageMagick-7.1.2-4/MagickCore/monitor-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/monitor-private.h
rename to ImageMagick-7.1.2-4/MagickCore/monitor-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/monitor.c b/ImageMagick-7.1.2-4/MagickCore/monitor.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/monitor.c
rename to ImageMagick-7.1.2-4/MagickCore/monitor.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/monitor.h b/ImageMagick-7.1.2-4/MagickCore/monitor.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/monitor.h
rename to ImageMagick-7.1.2-4/MagickCore/monitor.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/montage.c b/ImageMagick-7.1.2-4/MagickCore/montage.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/montage.c
rename to ImageMagick-7.1.2-4/MagickCore/montage.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/montage.h b/ImageMagick-7.1.2-4/MagickCore/montage.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/montage.h
rename to ImageMagick-7.1.2-4/MagickCore/montage.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/morphology-private.h b/ImageMagick-7.1.2-4/MagickCore/morphology-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/morphology-private.h
rename to ImageMagick-7.1.2-4/MagickCore/morphology-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/morphology.c b/ImageMagick-7.1.2-4/MagickCore/morphology.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/morphology.c
rename to ImageMagick-7.1.2-4/MagickCore/morphology.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/morphology.h b/ImageMagick-7.1.2-4/MagickCore/morphology.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/morphology.h
rename to ImageMagick-7.1.2-4/MagickCore/morphology.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/mutex.h b/ImageMagick-7.1.2-4/MagickCore/mutex.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/mutex.h
rename to ImageMagick-7.1.2-4/MagickCore/mutex.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/nt-base-private.h b/ImageMagick-7.1.2-4/MagickCore/nt-base-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/nt-base-private.h
rename to ImageMagick-7.1.2-4/MagickCore/nt-base-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/nt-base.c b/ImageMagick-7.1.2-4/MagickCore/nt-base.c
similarity index 99%
rename from ImageMagick-7.1.2-3/MagickCore/nt-base.c
rename to ImageMagick-7.1.2-4/MagickCore/nt-base.c
index 791fd4f3f..06ef0018c 100644
--- a/ImageMagick-7.1.2-3/MagickCore/nt-base.c
+++ b/ImageMagick-7.1.2-4/MagickCore/nt-base.c
@@ -1993,7 +1993,6 @@ MagickPrivate MagickBooleanType NTReportEvent(const char *event,
 */
 MagickPrivate unsigned char *NTResourceToBlob(const char *id)
 {
-
 #ifndef MAGICKCORE_LIBRARY_NAME
   char
     path[MagickPathExtent];
diff --git a/ImageMagick-7.1.2-3/MagickCore/nt-base.h b/ImageMagick-7.1.2-4/MagickCore/nt-base.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/nt-base.h
rename to ImageMagick-7.1.2-4/MagickCore/nt-base.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/nt-feature.c b/ImageMagick-7.1.2-4/MagickCore/nt-feature.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/nt-feature.c
rename to ImageMagick-7.1.2-4/MagickCore/nt-feature.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/nt-feature.h b/ImageMagick-7.1.2-4/MagickCore/nt-feature.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/nt-feature.h
rename to ImageMagick-7.1.2-4/MagickCore/nt-feature.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/opencl-private.h b/ImageMagick-7.1.2-4/MagickCore/opencl-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/opencl-private.h
rename to ImageMagick-7.1.2-4/MagickCore/opencl-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/opencl.c b/ImageMagick-7.1.2-4/MagickCore/opencl.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/opencl.c
rename to ImageMagick-7.1.2-4/MagickCore/opencl.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/opencl.h b/ImageMagick-7.1.2-4/MagickCore/opencl.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/opencl.h
rename to ImageMagick-7.1.2-4/MagickCore/opencl.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/option-private.h b/ImageMagick-7.1.2-4/MagickCore/option-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/option-private.h
rename to ImageMagick-7.1.2-4/MagickCore/option-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/option.c b/ImageMagick-7.1.2-4/MagickCore/option.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/option.c
rename to ImageMagick-7.1.2-4/MagickCore/option.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/option.h b/ImageMagick-7.1.2-4/MagickCore/option.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/option.h
rename to ImageMagick-7.1.2-4/MagickCore/option.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/paint.c b/ImageMagick-7.1.2-4/MagickCore/paint.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/paint.c
rename to ImageMagick-7.1.2-4/MagickCore/paint.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/paint.h b/ImageMagick-7.1.2-4/MagickCore/paint.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/paint.h
rename to ImageMagick-7.1.2-4/MagickCore/paint.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/pixel-accessor.h b/ImageMagick-7.1.2-4/MagickCore/pixel-accessor.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/pixel-accessor.h
rename to ImageMagick-7.1.2-4/MagickCore/pixel-accessor.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/pixel-private.h b/ImageMagick-7.1.2-4/MagickCore/pixel-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/pixel-private.h
rename to ImageMagick-7.1.2-4/MagickCore/pixel-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/pixel.c b/ImageMagick-7.1.2-4/MagickCore/pixel.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/pixel.c
rename to ImageMagick-7.1.2-4/MagickCore/pixel.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/pixel.h b/ImageMagick-7.1.2-4/MagickCore/pixel.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/pixel.h
rename to ImageMagick-7.1.2-4/MagickCore/pixel.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/policy-private.h b/ImageMagick-7.1.2-4/MagickCore/policy-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/policy-private.h
rename to ImageMagick-7.1.2-4/MagickCore/policy-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/policy.c b/ImageMagick-7.1.2-4/MagickCore/policy.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/policy.c
rename to ImageMagick-7.1.2-4/MagickCore/policy.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/policy.h b/ImageMagick-7.1.2-4/MagickCore/policy.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/policy.h
rename to ImageMagick-7.1.2-4/MagickCore/policy.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/prepress.c b/ImageMagick-7.1.2-4/MagickCore/prepress.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/prepress.c
rename to ImageMagick-7.1.2-4/MagickCore/prepress.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/prepress.h b/ImageMagick-7.1.2-4/MagickCore/prepress.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/prepress.h
rename to ImageMagick-7.1.2-4/MagickCore/prepress.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/profile-private.h b/ImageMagick-7.1.2-4/MagickCore/profile-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/profile-private.h
rename to ImageMagick-7.1.2-4/MagickCore/profile-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/profile.c b/ImageMagick-7.1.2-4/MagickCore/profile.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/profile.c
rename to ImageMagick-7.1.2-4/MagickCore/profile.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/profile.h b/ImageMagick-7.1.2-4/MagickCore/profile.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/profile.h
rename to ImageMagick-7.1.2-4/MagickCore/profile.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/property.c b/ImageMagick-7.1.2-4/MagickCore/property.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/property.c
rename to ImageMagick-7.1.2-4/MagickCore/property.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/property.h b/ImageMagick-7.1.2-4/MagickCore/property.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/property.h
rename to ImageMagick-7.1.2-4/MagickCore/property.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantize.c b/ImageMagick-7.1.2-4/MagickCore/quantize.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/quantize.c
rename to ImageMagick-7.1.2-4/MagickCore/quantize.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantize.h b/ImageMagick-7.1.2-4/MagickCore/quantize.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/quantize.h
rename to ImageMagick-7.1.2-4/MagickCore/quantize.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantum-export.c b/ImageMagick-7.1.2-4/MagickCore/quantum-export.c
similarity index 91%
rename from ImageMagick-7.1.2-3/MagickCore/quantum-export.c
rename to ImageMagick-7.1.2-4/MagickCore/quantum-export.c
index da8a91940..c12c3e165 100644
--- a/ImageMagick-7.1.2-3/MagickCore/quantum-export.c
+++ b/ImageMagick-7.1.2-4/MagickCore/quantum-export.c
@@ -237,9 +237,9 @@ static inline unsigned char *PopQuantumLongPixel(QuantumInfo *quantum_info,
   return(pixels);
 }
 
-static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
+static void ExportPixelChannel(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
-  unsigned char *magick_restrict q)
+  unsigned char *magick_restrict q,PixelChannel channel)
 {
   QuantumAny
     range;
@@ -247,6 +247,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
+  p+=(ptrdiff_t) image->channel_map[channel].offset;
   switch (quantum_info->depth)
   {
     case 8:
@@ -256,7 +257,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
 
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
+        pixel=ScaleQuantumToChar(*p);
         q=PopCharPixel(pixel,q);
         p+=(ptrdiff_t) GetPixelChannels(image);
         q+=(ptrdiff_t) quantum_info->pad;
@@ -272,8 +273,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            pixel=SinglePrecisionToHalf(QuantumScale*(double)
-              GetPixelAlpha(image,p));
+            pixel=SinglePrecisionToHalf(QuantumScale*(*p));
             q=PopShortPixel(quantum_info->endian,pixel,q);
             p+=(ptrdiff_t) GetPixelChannels(image);
             q+=(ptrdiff_t) quantum_info->pad;
@@ -282,7 +282,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
         }
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
+        pixel=ScaleQuantumToShort(*p);
         q=PopShortPixel(quantum_info->endian,pixel,q);
         p+=(ptrdiff_t) GetPixelChannels(image);
         q+=(ptrdiff_t) quantum_info->pad;
@@ -298,7 +298,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopQuantumFloatPixel(quantum_info,(float) GetPixelAlpha(image,p),q);
+            q=PopQuantumFloatPixel(quantum_info,(float) *p,q);
             p+=(ptrdiff_t) GetPixelChannels(image);
             q+=(ptrdiff_t) quantum_info->pad;
           }
@@ -306,7 +306,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
         }
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
+        pixel=ScaleQuantumToLong(*p);
         q=PopLongPixel(quantum_info->endian,pixel,q);
         p+=(ptrdiff_t) GetPixelChannels(image);
         q+=(ptrdiff_t) quantum_info->pad;
@@ -319,7 +319,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
         {
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
-            q=PopQuantumDoublePixel(quantum_info,(double) GetPixelAlpha(image,p),q);
+            q=PopQuantumDoublePixel(quantum_info,(double) *p,q);
             p+=(ptrdiff_t) GetPixelChannels(image);
             q+=(ptrdiff_t) quantum_info->pad;
           }
@@ -332,8 +332,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
       range=GetQuantumRange(quantum_info->depth);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelAlpha(image,p),
-          range),q);
+        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(*p,range),q);
         p+=(ptrdiff_t) GetPixelChannels(image);
         q+=(ptrdiff_t) quantum_info->pad;
       }
@@ -342,6 +341,19 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
+static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
+  const MagickSizeType number_pixels,const Quantum *magick_restrict p,
+  unsigned char *magick_restrict q,ExceptionInfo *exception)
+{
+  if (image->alpha_trait == UndefinedPixelTrait)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ImageDoesNotHaveAnAlphaChannel","`%s'",image->filename);
+      return;
+    }
+  ExportPixelChannel(image,quantum_info,number_pixels,p,q,AlphaPixelChannel);
+}
+
 static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
   unsigned char *magick_restrict q)
@@ -1141,218 +1153,13 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
   unsigned char *magick_restrict q,ExceptionInfo *exception)
 {
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickCoreSignature);
   if (image->colorspace != CMYKColorspace)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
         "ColorSeparatedImageRequired","`%s'",image->filename);
       return;
     }
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToChar(GetPixelBlack(image,p));
-        q=PopCharPixel(pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            pixel=SinglePrecisionToHalf(QuantumScale*(double)
-              GetPixelBlack(image,p));
-            q=PopShortPixel(quantum_info->endian,pixel,q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToShort(GetPixelBlack(image,p));
-        q=PopShortPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 32:
-    {
-      unsigned int
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlack(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToLong(GetPixelBlack(image,p));
-        q=PopLongPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlack(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelBlack(image,p),
-          range),q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-  }
-}
-
-static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const Quantum *magick_restrict p,
-  unsigned char *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
-        q=PopCharPixel(pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            pixel=SinglePrecisionToHalf(QuantumScale*(double)
-              GetPixelBlue(image,p));
-            q=PopShortPixel(quantum_info->endian,pixel,q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
-        q=PopShortPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 32:
-    {
-      unsigned int
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
-        q=PopLongPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlue(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelBlue(image,p),
-          range),q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-  }
+  ExportPixelChannel(image,quantum_info,number_pixels,p,q,BlackPixelChannel);
 }
 
 static void ExportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info,
@@ -1475,8 +1282,6 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickCoreSignature);
   if (image->colorspace != CMYKColorspace)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1627,8 +1432,6 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickCoreSignature);
   if (image->colorspace != CMYKColorspace)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -1802,8 +1605,6 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickCoreSignature);
   if (image->colorspace != CMYKColorspace)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
@@ -2434,111 +2235,6 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
-static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const Quantum *magick_restrict p,
-  unsigned char *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
-        q=PopCharPixel(pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            pixel=SinglePrecisionToHalf(QuantumScale*(double)
-              GetPixelGreen(image,p));
-            q=PopShortPixel(quantum_info->endian,pixel,q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
-        q=PopShortPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 32:
-    {
-      unsigned int
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
-        q=PopLongPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelGreen(image,p),
-          range),q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-  }
-}
-
 static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
   unsigned char *magick_restrict q,ExceptionInfo *exception)
@@ -2921,6 +2617,12 @@ static void ExportMultispectralQuantum(const Image *image,
         "MultispectralImageRequired","`%s'",image->filename);
       return;
     }
+  if (quantum_info->meta_channel != 0)
+    {
+      ExportPixelChannel(image,quantum_info,number_pixels,p,q,
+        (PixelChannel) (MetaPixelChannels+quantum_info->meta_channel-1));
+      return;
+    }
   switch (quantum_info->depth)
   {
     case 8:
@@ -3034,7 +2736,7 @@ static void ExportMultispectralQuantum(const Image *image,
 
 static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
-  unsigned char *magick_restrict q)
+  unsigned char *magick_restrict q,ExceptionInfo *exception)
 {
   QuantumAny
     range;
@@ -3042,6 +2744,12 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
+  if (image->alpha_trait == UndefinedPixelTrait)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ImageDoesNotHaveAnAlphaChannel","`%s'",image->filename);
+      return;
+    }
   switch (quantum_info->depth)
   {
     case 8:
@@ -3137,111 +2845,6 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
-static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const Quantum *magick_restrict p,
-  unsigned char *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToChar(GetPixelRed(image,p));
-        q=PopCharPixel(pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            pixel=SinglePrecisionToHalf(QuantumScale*(double)
-              GetPixelRed(image,p));
-            q=PopShortPixel(quantum_info->endian,pixel,q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToShort(GetPixelRed(image,p));
-        q=PopShortPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 32:
-    {
-      unsigned int
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=ScaleQuantumToLong(GetPixelRed(image,p));
-        q=PopLongPixel(quantum_info->endian,pixel,q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
-            p+=(ptrdiff_t) GetPixelChannels(image);
-            q+=(ptrdiff_t) quantum_info->pad;
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelRed(image,p),
-          range),q);
-        p+=(ptrdiff_t) GetPixelChannels(image);
-        q+=(ptrdiff_t) quantum_info->pad;
-      }
-      break;
-    }
-  }
-}
-
 static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const Quantum *magick_restrict p,
   unsigned char *magick_restrict q)
@@ -4070,6 +3673,8 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
   assert(image->signature == MagickCoreSignature);
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickCoreSignature);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (pixels == (unsigned char *) NULL)
@@ -4143,7 +3748,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
   {
     case AlphaQuantum:
     {
-      ExportAlphaQuantum(image,quantum_info,number_pixels,p,q);
+      ExportAlphaQuantum(image,quantum_info,number_pixels,p,q,exception);
       break;
     }
     case BGRQuantum:
@@ -4169,7 +3774,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
     case BlueQuantum:
     case YellowQuantum:
     {
-      ExportBlueQuantum(image,quantum_info,number_pixels,p,q);
+      ExportPixelChannel(image,quantum_info,number_pixels,p,q,BluePixelChannel);
       break;
     }
     case CMYKQuantum:
@@ -4210,7 +3815,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
     case GreenQuantum:
     case MagentaQuantum:
     {
-      ExportGreenQuantum(image,quantum_info,number_pixels,p,q);
+      ExportPixelChannel(image,quantum_info,number_pixels,p,q,GreenPixelChannel);
       break;
     }
     case IndexQuantum:
@@ -4226,12 +3831,12 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
     case RedQuantum:
     case CyanQuantum:
     {
-      ExportRedQuantum(image,quantum_info,number_pixels,p,q);
+      ExportPixelChannel(image,quantum_info,number_pixels,p,q,RedPixelChannel);
       break;
     }
     case OpacityQuantum:
     {
-      ExportOpacityQuantum(image,quantum_info,number_pixels,p,q);
+      ExportOpacityQuantum(image,quantum_info,number_pixels,p,q,exception);
       break;
     }
     case RGBQuantum:
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantum-import.c b/ImageMagick-7.1.2-4/MagickCore/quantum-import.c
similarity index 90%
rename from ImageMagick-7.1.2-3/MagickCore/quantum-import.c
rename to ImageMagick-7.1.2-4/MagickCore/quantum-import.c
index ae8cf83ca..e4ca8041c 100644
--- a/ImageMagick-7.1.2-3/MagickCore/quantum-import.c
+++ b/ImageMagick-7.1.2-4/MagickCore/quantum-import.c
@@ -298,9 +298,9 @@ static inline const unsigned char *PushQuantumLongPixel(
   return(pixels);
 }
 
-static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
+static void ImportPixelChannel(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
+  Quantum *magick_restrict q,PixelChannel channel)
 {
   QuantumAny
     range;
@@ -308,8 +308,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
+  q+=(ptrdiff_t) image->channel_map[channel].offset;
   switch (quantum_info->depth)
   {
     case 8:
@@ -320,7 +319,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
         p=PushCharPixel(p,&pixel);
-        SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
+        *q=ScaleCharToQuantum(pixel);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -336,8 +335,8 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
+            *q=ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel));
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -346,7 +345,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
         p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
+        *q=ScaleShortToQuantum(pixel);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -362,7 +361,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
+            *q=ClampToQuantum(pixel);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -376,7 +375,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+            *q=ScaleLongToQuantum(pixel);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -393,7 +392,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
+            *q=ClampToQuantum(pixel);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -411,7 +410,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
+            *q=ClampToQuantum(pixel);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -428,7 +427,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
         p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+        *q=ScaleAnyToQuantum(pixel,range);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -437,6 +436,19 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
+static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
+  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
+  Quantum *magick_restrict q,ExceptionInfo *exception)
+{
+  if (image->alpha_trait == UndefinedPixelTrait)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ImageDoesNotHaveAnAlphaChannel","`%s'",image->filename);
+      return;
+    }
+  ImportPixelChannel(image,quantum_info,number_pixels,p,q,AlphaPixelChannel);
+}
+
 static void ImportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
   Quantum *magick_restrict q)
@@ -1316,6 +1328,114 @@ static void ImportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
 static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
   Quantum *magick_restrict q,ExceptionInfo *exception)
+{
+  if (image->colorspace != CMYKColorspace)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ColorSeparatedImageRequired","`%s'",image->filename);
+      return;
+    }
+  ImportPixelChannel(image,quantum_info,number_pixels,p,q,BlackPixelChannel);
+}
+
+static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info,
+  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
+  Quantum *magick_restrict q)
+{
+  QuantumAny
+    range;
+
+  ssize_t
+    x;
+
+  unsigned int
+    pixel;
+
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  switch (quantum_info->depth)
+  {
+    case 10:
+    {
+      Quantum
+        cbcr[4];
+
+      pixel=0;
+      if (quantum_info->pack == MagickFalse)
+        {
+          ssize_t
+            i;
+
+          size_t
+            quantum;
+
+          ssize_t
+            n;
+
+          n=0;
+          quantum=0;
+          for (x=0; x < (ssize_t) (number_pixels-3); x+=4)
+          {
+            for (i=0; i < 4; i++)
+            {
+              switch (n % 3)
+              {
+                case 0:
+                {
+                  p=PushLongPixel(quantum_info->endian,p,&pixel);
+                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+                    (((pixel >> 22) & 0x3ff) << 6)));
+                  break;
+                }
+                case 1:
+                {
+                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+                    (((pixel >> 12) & 0x3ff) << 6)));
+                  break;
+                }
+                case 2:
+                {
+                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+                    (((pixel >> 2) & 0x3ff) << 6)));
+                  break;
+                }
+              }
+              cbcr[i]=(Quantum) (quantum);
+              n++;
+            }
+            p+=(ptrdiff_t) quantum_info->pad;
+            SetPixelRed(image,cbcr[1],q);
+            SetPixelGreen(image,cbcr[0],q);
+            SetPixelBlue(image,cbcr[2],q);
+            q+=(ptrdiff_t) GetPixelChannels(image);
+            SetPixelRed(image,cbcr[3],q);
+            SetPixelGreen(image,cbcr[0],q);
+            SetPixelBlue(image,cbcr[2],q);
+            q+=(ptrdiff_t) GetPixelChannels(image);
+          }
+          break;
+        }
+      magick_fallthrough;
+    }
+    default:
+    {
+      range=GetQuantumRange(quantum_info->depth);
+      for (x=0; x < (ssize_t) number_pixels; x++)
+      {
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+        q+=(ptrdiff_t) GetPixelChannels(image);
+      }
+      break;
+    }
+  }
+}
+
+static void ImportCMYKQuantum(const Image *image,QuantumInfo *quantum_info,
+  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
+  Quantum *magick_restrict q,ExceptionInfo *exception)
 {
   QuantumAny
     range;
@@ -1338,6 +1458,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
 
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
+        p=PushCharPixel(p,&pixel);
+        SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
         p=PushCharPixel(p,&pixel);
         SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
         p+=(ptrdiff_t) quantum_info->pad;
@@ -1355,6 +1481,15 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelRed(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelBlue(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
             SetPixelBlack(image,ClampToQuantum((double) QuantumRange*(double)
               HalfToSinglePrecision(pixel)),q);
             p+=(ptrdiff_t) quantum_info->pad;
@@ -1364,6 +1499,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
         }
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
         p=PushShortPixel(quantum_info->endian,p,&pixel);
         SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
         p+=(ptrdiff_t) quantum_info->pad;
@@ -1380,6 +1521,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelBlue(image,ClampToQuantum(pixel),q);
             p=PushQuantumFloatPixel(quantum_info,p,&pixel);
             SetPixelBlack(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
@@ -1394,6 +1541,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
             p=PushLongPixel(quantum_info->endian,p,&pixel);
             SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
@@ -1411,6 +1564,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelBlue(image,ClampToQuantum(pixel),q);
             p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
             SetPixelBlack(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
@@ -1429,6 +1588,12 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelBlue(image,ClampToQuantum(pixel),q);
             p=PushDoublePixel(quantum_info,p,&pixel);
             SetPixelBlack(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
@@ -1446,9 +1611,14 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
       range=GetQuantumRange(quantum_info->depth);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
         p=PushQuantumPixel(quantum_info,p,&pixel);
         SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
-        p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
       break;
@@ -1456,9 +1626,9 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
-static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
+static void ImportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
+  Quantum *magick_restrict q,ExceptionInfo *exception)
 {
   QuantumAny
     range;
@@ -1466,8 +1636,12 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
+  if (image->colorspace != CMYKColorspace)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ColorSeparatedImageRequired","`%s'",image->filename);
+      return;
+    }
   switch (quantum_info->depth)
   {
     case 8:
@@ -1477,8 +1651,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
 
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
+        p=PushCharPixel(p,&pixel);
+        SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
         p=PushCharPixel(p,&pixel);
         SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -1494,8 +1676,20 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelRed(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
             SetPixelBlue(image,ClampToQuantum((double) QuantumRange*(double)
               HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelBlack(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -1503,8 +1697,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
         }
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
         p=PushShortPixel(quantum_info->endian,p,&pixel);
         SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -1519,8 +1721,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
             p=PushQuantumFloatPixel(quantum_info,p,&pixel);
             SetPixelBlue(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelBlack(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -1533,8 +1743,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
             p=PushLongPixel(quantum_info->endian,p,&pixel);
             SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -1550,8 +1768,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
             p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
             SetPixelBlue(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelBlack(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -1568,499 +1794,16 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info,
 
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelRed(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelGreen(image,ClampToQuantum(pixel),q);
             p=PushDoublePixel(quantum_info,p,&pixel);
             SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      unsigned int
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-  }
-}
-
-static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  unsigned int
-    pixel;
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
-  switch (quantum_info->depth)
-  {
-    case 10:
-    {
-      Quantum
-        cbcr[4];
-
-      pixel=0;
-      if (quantum_info->pack == MagickFalse)
-        {
-          ssize_t
-            i;
-
-          size_t
-            quantum;
-
-          ssize_t
-            n;
-
-          n=0;
-          quantum=0;
-          for (x=0; x < (ssize_t) (number_pixels-3); x+=4)
-          {
-            for (i=0; i < 4; i++)
-            {
-              switch (n % 3)
-              {
-                case 0:
-                {
-                  p=PushLongPixel(quantum_info->endian,p,&pixel);
-                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
-                    (((pixel >> 22) & 0x3ff) << 6)));
-                  break;
-                }
-                case 1:
-                {
-                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
-                    (((pixel >> 12) & 0x3ff) << 6)));
-                  break;
-                }
-                case 2:
-                {
-                  quantum=(size_t) (ScaleShortToQuantum((unsigned short)
-                    (((pixel >> 2) & 0x3ff) << 6)));
-                  break;
-                }
-              }
-              cbcr[i]=(Quantum) (quantum);
-              n++;
-            }
-            p+=(ptrdiff_t) quantum_info->pad;
-            SetPixelRed(image,cbcr[1],q);
-            SetPixelGreen(image,cbcr[0],q);
-            SetPixelBlue(image,cbcr[2],q);
-            q+=(ptrdiff_t) GetPixelChannels(image);
-            SetPixelRed(image,cbcr[3],q);
-            SetPixelGreen(image,cbcr[0],q);
-            SetPixelBlue(image,cbcr[2],q);
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-  }
-}
-
-static void ImportCMYKQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q,ExceptionInfo *exception)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  if (image->colorspace != CMYKColorspace)
-    {
-      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
-        "ColorSeparatedImageRequired","`%s'",image->filename);
-      return;
-    }
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushCharPixel(p,&pixel);
-        SetPixelRed(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelRed(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 32:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      else
-        {
-          unsigned int
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-    }
-    case 24:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          double
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      unsigned int
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-  }
-}
-
-static void ImportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q,ExceptionInfo *exception)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  if (image->colorspace != CMYKColorspace)
-    {
-      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
-        "ColorSeparatedImageRequired","`%s'",image->filename);
-      return;
-    }
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushCharPixel(p,&pixel);
-        SetPixelRed(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelRed(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 32:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      else
-        {
-          unsigned int
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-    }
-    case 24:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          double
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelBlue(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelBlack(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelBlack(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -2693,184 +2436,44 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
             TransparentAlpha : OpaqueAlpha,q);
           q+=(ptrdiff_t) GetPixelChannels(image);
         }
-      if (bit != 0)
-        p++;
-      break;
-    }
-    case 4:
-    {
-      unsigned char
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        pixel=(unsigned char) ((*p >> 4) & 0xf);
-        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
-        pixel=(unsigned char) ((*p) & 0xf);
-        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
-        p++;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushCharPixel(p,&pixel);
-        SetPixelGray(image,ScaleCharToQuantum(pixel),q);
-        p=PushCharPixel(p,&pixel);
-        SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 10:
-    {
-      unsigned int
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 12:
-    {
-      unsigned int
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelGray(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelGray(image,ScaleShortToQuantum(pixel),q);
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 32:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelGray(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      else
-        {
-          unsigned int
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelGray(image,ScaleLongToQuantum(pixel),q);
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-    }
-    case 24:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelGray(image,ClampToQuantum(pixel),q);
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
+      if (bit != 0)
+        p++;
+      break;
     }
-    case 64:
+    case 4:
     {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          double
-            pixel;
+      unsigned char
+        pixel;
 
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelGray(image,ClampToQuantum(pixel),q);
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelAlpha(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
+      range=GetQuantumRange(quantum_info->depth);
+      for (x=0; x < (ssize_t) number_pixels; x++)
+      {
+        pixel=(unsigned char) ((*p >> 4) & 0xf);
+        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+        pixel=(unsigned char) ((*p) & 0xf);
+        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+        p++;
+        q+=(ptrdiff_t) GetPixelChannels(image);
+      }
+      break;
     }
-    default:
+    case 8:
+    {
+      unsigned char
+        pixel;
+
+      for (x=0; x < (ssize_t) number_pixels; x++)
+      {
+        p=PushCharPixel(p,&pixel);
+        SetPixelGray(image,ScaleCharToQuantum(pixel),q);
+        p=PushCharPixel(p,&pixel);
+        SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
+        p+=(ptrdiff_t) quantum_info->pad;
+        q+=(ptrdiff_t) GetPixelChannels(image);
+      }
+      break;
+    }
+    case 10:
     {
       unsigned int
         pixel;
@@ -2887,32 +2490,18 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
       }
       break;
     }
-  }
-}
-
-static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
-  switch (quantum_info->depth)
-  {
-    case 8:
+    case 12:
     {
-      unsigned char
+      unsigned int
         pixel;
 
+      range=GetQuantumRange(quantum_info->depth);
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
-        p=PushCharPixel(p,&pixel);
-        SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -2928,7 +2517,10 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum((double) QuantumRange*(double)
+            SetPixelGray(image,ClampToQuantum((double) QuantumRange*(double)
+              HalfToSinglePrecision(pixel)),q);
+            p=PushShortPixel(quantum_info->endian,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum((double) QuantumRange*(double)
               HalfToSinglePrecision(pixel)),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
@@ -2938,7 +2530,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
         p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
+        SetPixelGray(image,ScaleShortToQuantum(pixel),q);
+        p=PushShortPixel(quantum_info->endian,p,&pixel);
+        SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -2954,7 +2548,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            SetPixelGray(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -2968,7 +2564,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+            SetPixelGray(image,ScaleLongToQuantum(pixel),q);
+            p=PushLongPixel(quantum_info->endian,p,&pixel);
+            SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -2985,7 +2583,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            SetPixelGray(image,ClampToQuantum(pixel),q);
+            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -3003,7 +2603,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
           for (x=0; x < (ssize_t) number_pixels; x++)
           {
             p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelGreen(image,ClampToQuantum(pixel),q);
+            SetPixelGray(image,ClampToQuantum(pixel),q);
+            p=PushDoublePixel(quantum_info,p,&pixel);
+            SetPixelAlpha(image,ClampToQuantum(pixel),q);
             p+=(ptrdiff_t) quantum_info->pad;
             q+=(ptrdiff_t) GetPixelChannels(image);
           }
@@ -3020,7 +2622,9 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info,
       for (x=0; x < (ssize_t) number_pixels; x++)
       {
         p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+        SetPixelGray(image,ScaleAnyToQuantum(pixel,range),q);
+        p=PushQuantumPixel(quantum_info,p,&pixel);
+        SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
         p+=(ptrdiff_t) quantum_info->pad;
         q+=(ptrdiff_t) GetPixelChannels(image);
       }
@@ -3528,6 +3132,12 @@ static void ImportMultispectralQuantum(const Image *image,
         "MultispectralImageRequired","`%s'",image->filename);
       return;
     }
+  if (quantum_info->meta_channel != 0)
+    {
+      ImportPixelChannel(image,quantum_info,number_pixels,p,q,
+        (PixelChannel) (MetaPixelChannels+quantum_info->meta_channel-1));
+      return;
+    }
   switch (quantum_info->depth)
   {
     case 8:
@@ -3679,7 +3289,7 @@ static void ImportMultispectralQuantum(const Image *image,
 
 static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
+  Quantum *magick_restrict q,ExceptionInfo* exception)
 {
   QuantumAny
     range;
@@ -3687,8 +3297,12 @@ static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   ssize_t
     x;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
+  if (image->alpha_trait == UndefinedPixelTrait)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+        "ImageDoesNotHaveAnAlphaChannel","`%s'",image->filename);
+      return;
+    }
   switch (quantum_info->depth)
   {
     case 8:
@@ -3816,145 +3430,6 @@ static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info,
   }
 }
 
-static void ImportRedQuantum(const Image *image,QuantumInfo *quantum_info,
-  const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
-  Quantum *magick_restrict q)
-{
-  QuantumAny
-    range;
-
-  ssize_t
-    x;
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
-  switch (quantum_info->depth)
-  {
-    case 8:
-    {
-      unsigned char
-        pixel;
-
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushCharPixel(p,&pixel);
-        SetPixelRed(image,ScaleCharToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 16:
-    {
-      unsigned short
-        pixel;
-
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushShortPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ClampToQuantum((double) QuantumRange*(double)
-              HalfToSinglePrecision(pixel)),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushShortPixel(quantum_info->endian,p,&pixel);
-        SetPixelRed(image,ScaleShortToQuantum(pixel),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-    case 32:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloatPixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      else
-        {
-          unsigned int
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushLongPixel(quantum_info->endian,p,&pixel);
-            SetPixelRed(image,ScaleLongToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-    }
-    case 24:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          float
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushQuantumFloat24Pixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    case 64:
-    {
-      if (quantum_info->format == FloatingPointQuantumFormat)
-        {
-          double
-            pixel;
-
-          for (x=0; x < (ssize_t) number_pixels; x++)
-          {
-            p=PushDoublePixel(quantum_info,p,&pixel);
-            SetPixelRed(image,ClampToQuantum(pixel),q);
-            p+=(ptrdiff_t) quantum_info->pad;
-            q+=(ptrdiff_t) GetPixelChannels(image);
-          }
-          break;
-        }
-      magick_fallthrough;
-    }
-    default:
-    {
-      unsigned int
-        pixel;
-
-      range=GetQuantumRange(quantum_info->depth);
-      for (x=0; x < (ssize_t) number_pixels; x++)
-      {
-        p=PushQuantumPixel(quantum_info,p,&pixel);
-        SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
-        p+=(ptrdiff_t) quantum_info->pad;
-        q+=(ptrdiff_t) GetPixelChannels(image);
-      }
-      break;
-    }
-  }
-}
-
 static void ImportRGBQuantum(const Image *image,QuantumInfo *quantum_info,
   const MagickSizeType number_pixels,const unsigned char *magick_restrict p,
   Quantum *magick_restrict q)
@@ -4855,6 +4330,8 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
   assert(image->signature == MagickCoreSignature);
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickCoreSignature);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (pixels == (const unsigned char *) NULL)
@@ -4877,7 +4354,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
   {
     case AlphaQuantum:
     {
-      ImportAlphaQuantum(image,quantum_info,number_pixels,p,q);
+      ImportAlphaQuantum(image,quantum_info,number_pixels,p,q,exception);
       break;
     }
     case BGRQuantum:
@@ -4903,7 +4380,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
     case BlueQuantum:
     case YellowQuantum:
     {
-      ImportBlueQuantum(image,quantum_info,number_pixels,p,q);
+      ImportPixelChannel(image,quantum_info,number_pixels,p,q,BluePixelChannel);
       break;
     }
     case CMYKQuantum:
@@ -4944,7 +4421,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
     case GreenQuantum:
     case MagentaQuantum:
     {
-      ImportGreenQuantum(image,quantum_info,number_pixels,p,q);
+      ImportPixelChannel(image,quantum_info,number_pixels,p,q,GreenPixelChannel);
       break;
     }
     case IndexQuantum:
@@ -4959,13 +4436,13 @@ MagickExport size_t ImportQuantumPixels(const Image *image,
     }
     case OpacityQuantum:
     {
-      ImportOpacityQuantum(image,quantum_info,number_pixels,p,q);
+      ImportOpacityQuantum(image,quantum_info,number_pixels,p,q,exception);
       break;
     }
     case RedQuantum:
     case CyanQuantum:
     {
-      ImportRedQuantum(image,quantum_info,number_pixels,p,q);
+      ImportPixelChannel(image,quantum_info,number_pixels,p,q,RedPixelChannel);
       break;
     }
     case RGBQuantum:
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantum-private.h b/ImageMagick-7.1.2-4/MagickCore/quantum-private.h
similarity index 99%
rename from ImageMagick-7.1.2-3/MagickCore/quantum-private.h
rename to ImageMagick-7.1.2-4/MagickCore/quantum-private.h
index 66d8ce3d9..27fcb2e03 100644
--- a/ImageMagick-7.1.2-3/MagickCore/quantum-private.h
+++ b/ImageMagick-7.1.2-4/MagickCore/quantum-private.h
@@ -87,6 +87,9 @@ struct _QuantumInfo
 
   size_t
     signature;
+
+  size_t
+    meta_channel;
 };
 
 extern MagickPrivate void
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantum.c b/ImageMagick-7.1.2-4/MagickCore/quantum.c
similarity index 95%
rename from ImageMagick-7.1.2-3/MagickCore/quantum.c
rename to ImageMagick-7.1.2-4/MagickCore/quantum.c
index 9447d447c..228c81738 100644
--- a/ImageMagick-7.1.2-3/MagickCore/quantum.c
+++ b/ImageMagick-7.1.2-4/MagickCore/quantum.c
@@ -867,6 +867,47 @@ MagickExport void SetQuantumImageType(Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   S e t Q u a n t u m M e t a C h a n n e l                                 %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  SetQuantumMetaChannel() sets the quantum meta-channel that will exported or
+%  imported when the quantum type is MultispectralQuantum. To unset the
+%  meta-channel, set the meta-channel to -1.
+%
+%  The format of the SetQuantumMetaChannel method is:
+%
+%      void SetQuantumMetaChannel(const Image *image,QuantumInfo *quantum_info,
+%        const ssize_t meta_channel)
+%
+%  A description of each parameter follows:
+%
+%    o image: the image.
+%
+%    o quantum_info: the quantum info.
+%
+%    o meta_channel: the meta channel.
+%
+*/
+MagickExport MagickBooleanType SetQuantumMetaChannel(const Image *image,
+  QuantumInfo *quantum_info, const ssize_t meta_channel) 
+{
+  assert(quantum_info != (QuantumInfo *) NULL);
+  assert(quantum_info->signature == MagickCoreSignature);
+  if ((meta_channel < -1) ||
+      (meta_channel >= (ssize_t) image->number_meta_channels))
+    return(MagickFalse);
+  quantum_info->meta_channel=meta_channel+1;
+  return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   S e t Q u a n t u m P a c k                                               %
 %                                                                             %
 %                                                                             %
diff --git a/ImageMagick-7.1.2-3/MagickCore/quantum.h b/ImageMagick-7.1.2-4/MagickCore/quantum.h
similarity index 98%
rename from ImageMagick-7.1.2-3/MagickCore/quantum.h
rename to ImageMagick-7.1.2-4/MagickCore/quantum.h
index fda4910a1..2d0fda0e5 100644
--- a/ImageMagick-7.1.2-3/MagickCore/quantum.h
+++ b/ImageMagick-7.1.2-4/MagickCore/quantum.h
@@ -167,6 +167,7 @@ extern MagickExport MagickBooleanType
   SetQuantumDepth(const Image *,QuantumInfo *,const size_t),
   SetQuantumEndian(const Image *,QuantumInfo *,const EndianType),
   SetQuantumFormat(const Image *,QuantumInfo *,const QuantumFormatType),
+  SetQuantumMetaChannel(const Image *,QuantumInfo *,const ssize_t),
   SetQuantumPad(const Image *,QuantumInfo *,const size_t);
 
 extern MagickExport QuantumFormatType
diff --git a/ImageMagick-7.1.2-3/MagickCore/random-private.h b/ImageMagick-7.1.2-4/MagickCore/random-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/random-private.h
rename to ImageMagick-7.1.2-4/MagickCore/random-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/random.c b/ImageMagick-7.1.2-4/MagickCore/random.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/random.c
rename to ImageMagick-7.1.2-4/MagickCore/random.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/random_.h b/ImageMagick-7.1.2-4/MagickCore/random_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/random_.h
rename to ImageMagick-7.1.2-4/MagickCore/random_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/registry-private.h b/ImageMagick-7.1.2-4/MagickCore/registry-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/registry-private.h
rename to ImageMagick-7.1.2-4/MagickCore/registry-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/registry.c b/ImageMagick-7.1.2-4/MagickCore/registry.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/registry.c
rename to ImageMagick-7.1.2-4/MagickCore/registry.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/registry.h b/ImageMagick-7.1.2-4/MagickCore/registry.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/registry.h
rename to ImageMagick-7.1.2-4/MagickCore/registry.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resample-private.h b/ImageMagick-7.1.2-4/MagickCore/resample-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resample-private.h
rename to ImageMagick-7.1.2-4/MagickCore/resample-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resample.c b/ImageMagick-7.1.2-4/MagickCore/resample.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resample.c
rename to ImageMagick-7.1.2-4/MagickCore/resample.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/resample.h b/ImageMagick-7.1.2-4/MagickCore/resample.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resample.h
rename to ImageMagick-7.1.2-4/MagickCore/resample.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resize-private.h b/ImageMagick-7.1.2-4/MagickCore/resize-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resize-private.h
rename to ImageMagick-7.1.2-4/MagickCore/resize-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resize.c b/ImageMagick-7.1.2-4/MagickCore/resize.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resize.c
rename to ImageMagick-7.1.2-4/MagickCore/resize.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/resize.h b/ImageMagick-7.1.2-4/MagickCore/resize.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resize.h
rename to ImageMagick-7.1.2-4/MagickCore/resize.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resource-private.h b/ImageMagick-7.1.2-4/MagickCore/resource-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resource-private.h
rename to ImageMagick-7.1.2-4/MagickCore/resource-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/resource.c b/ImageMagick-7.1.2-4/MagickCore/resource.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resource.c
rename to ImageMagick-7.1.2-4/MagickCore/resource.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/resource_.h b/ImageMagick-7.1.2-4/MagickCore/resource_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/resource_.h
rename to ImageMagick-7.1.2-4/MagickCore/resource_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/segment.c b/ImageMagick-7.1.2-4/MagickCore/segment.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/segment.c
rename to ImageMagick-7.1.2-4/MagickCore/segment.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/segment.h b/ImageMagick-7.1.2-4/MagickCore/segment.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/segment.h
rename to ImageMagick-7.1.2-4/MagickCore/segment.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/semaphore-private.h b/ImageMagick-7.1.2-4/MagickCore/semaphore-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/semaphore-private.h
rename to ImageMagick-7.1.2-4/MagickCore/semaphore-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/semaphore.c b/ImageMagick-7.1.2-4/MagickCore/semaphore.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/semaphore.c
rename to ImageMagick-7.1.2-4/MagickCore/semaphore.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/semaphore.h b/ImageMagick-7.1.2-4/MagickCore/semaphore.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/semaphore.h
rename to ImageMagick-7.1.2-4/MagickCore/semaphore.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/shear.c b/ImageMagick-7.1.2-4/MagickCore/shear.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/shear.c
rename to ImageMagick-7.1.2-4/MagickCore/shear.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/shear.h b/ImageMagick-7.1.2-4/MagickCore/shear.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/shear.h
rename to ImageMagick-7.1.2-4/MagickCore/shear.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/signature-private.h b/ImageMagick-7.1.2-4/MagickCore/signature-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/signature-private.h
rename to ImageMagick-7.1.2-4/MagickCore/signature-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/signature.c b/ImageMagick-7.1.2-4/MagickCore/signature.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/signature.c
rename to ImageMagick-7.1.2-4/MagickCore/signature.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/signature.h b/ImageMagick-7.1.2-4/MagickCore/signature.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/signature.h
rename to ImageMagick-7.1.2-4/MagickCore/signature.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/splay-tree.c b/ImageMagick-7.1.2-4/MagickCore/splay-tree.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/splay-tree.c
rename to ImageMagick-7.1.2-4/MagickCore/splay-tree.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/splay-tree.h b/ImageMagick-7.1.2-4/MagickCore/splay-tree.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/splay-tree.h
rename to ImageMagick-7.1.2-4/MagickCore/splay-tree.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/static.c b/ImageMagick-7.1.2-4/MagickCore/static.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/static.c
rename to ImageMagick-7.1.2-4/MagickCore/static.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/static.h b/ImageMagick-7.1.2-4/MagickCore/static.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/static.h
rename to ImageMagick-7.1.2-4/MagickCore/static.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/statistic-private.h b/ImageMagick-7.1.2-4/MagickCore/statistic-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/statistic-private.h
rename to ImageMagick-7.1.2-4/MagickCore/statistic-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/statistic.c b/ImageMagick-7.1.2-4/MagickCore/statistic.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/statistic.c
rename to ImageMagick-7.1.2-4/MagickCore/statistic.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/statistic.h b/ImageMagick-7.1.2-4/MagickCore/statistic.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/statistic.h
rename to ImageMagick-7.1.2-4/MagickCore/statistic.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/stream-private.h b/ImageMagick-7.1.2-4/MagickCore/stream-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/stream-private.h
rename to ImageMagick-7.1.2-4/MagickCore/stream-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/stream.c b/ImageMagick-7.1.2-4/MagickCore/stream.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/stream.c
rename to ImageMagick-7.1.2-4/MagickCore/stream.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/stream.h b/ImageMagick-7.1.2-4/MagickCore/stream.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/stream.h
rename to ImageMagick-7.1.2-4/MagickCore/stream.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/string-private.h b/ImageMagick-7.1.2-4/MagickCore/string-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/string-private.h
rename to ImageMagick-7.1.2-4/MagickCore/string-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/string.c b/ImageMagick-7.1.2-4/MagickCore/string.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/string.c
rename to ImageMagick-7.1.2-4/MagickCore/string.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/string_.h b/ImageMagick-7.1.2-4/MagickCore/string_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/string_.h
rename to ImageMagick-7.1.2-4/MagickCore/string_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/studio.h b/ImageMagick-7.1.2-4/MagickCore/studio.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/studio.h
rename to ImageMagick-7.1.2-4/MagickCore/studio.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/thread-private.h b/ImageMagick-7.1.2-4/MagickCore/thread-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/thread-private.h
rename to ImageMagick-7.1.2-4/MagickCore/thread-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/thread.c b/ImageMagick-7.1.2-4/MagickCore/thread.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/thread.c
rename to ImageMagick-7.1.2-4/MagickCore/thread.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/thread_.h b/ImageMagick-7.1.2-4/MagickCore/thread_.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/thread_.h
rename to ImageMagick-7.1.2-4/MagickCore/thread_.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/threshold.c b/ImageMagick-7.1.2-4/MagickCore/threshold.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/threshold.c
rename to ImageMagick-7.1.2-4/MagickCore/threshold.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/threshold.h b/ImageMagick-7.1.2-4/MagickCore/threshold.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/threshold.h
rename to ImageMagick-7.1.2-4/MagickCore/threshold.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/timer-private.h b/ImageMagick-7.1.2-4/MagickCore/timer-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/timer-private.h
rename to ImageMagick-7.1.2-4/MagickCore/timer-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/timer.c b/ImageMagick-7.1.2-4/MagickCore/timer.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/timer.c
rename to ImageMagick-7.1.2-4/MagickCore/timer.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/timer.h b/ImageMagick-7.1.2-4/MagickCore/timer.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/timer.h
rename to ImageMagick-7.1.2-4/MagickCore/timer.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/token-private.h b/ImageMagick-7.1.2-4/MagickCore/token-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/token-private.h
rename to ImageMagick-7.1.2-4/MagickCore/token-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/token.c b/ImageMagick-7.1.2-4/MagickCore/token.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/token.c
rename to ImageMagick-7.1.2-4/MagickCore/token.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/token.h b/ImageMagick-7.1.2-4/MagickCore/token.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/token.h
rename to ImageMagick-7.1.2-4/MagickCore/token.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/transform-private.h b/ImageMagick-7.1.2-4/MagickCore/transform-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/transform-private.h
rename to ImageMagick-7.1.2-4/MagickCore/transform-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/transform.c b/ImageMagick-7.1.2-4/MagickCore/transform.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/transform.c
rename to ImageMagick-7.1.2-4/MagickCore/transform.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/transform.h b/ImageMagick-7.1.2-4/MagickCore/transform.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/transform.h
rename to ImageMagick-7.1.2-4/MagickCore/transform.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/type-private.h b/ImageMagick-7.1.2-4/MagickCore/type-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/type-private.h
rename to ImageMagick-7.1.2-4/MagickCore/type-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/type.c b/ImageMagick-7.1.2-4/MagickCore/type.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/type.c
rename to ImageMagick-7.1.2-4/MagickCore/type.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/type.h b/ImageMagick-7.1.2-4/MagickCore/type.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/type.h
rename to ImageMagick-7.1.2-4/MagickCore/type.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/utility-private.h b/ImageMagick-7.1.2-4/MagickCore/utility-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/utility-private.h
rename to ImageMagick-7.1.2-4/MagickCore/utility-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/utility.c b/ImageMagick-7.1.2-4/MagickCore/utility.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/utility.c
rename to ImageMagick-7.1.2-4/MagickCore/utility.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/utility.h b/ImageMagick-7.1.2-4/MagickCore/utility.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/utility.h
rename to ImageMagick-7.1.2-4/MagickCore/utility.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/version-private.h b/ImageMagick-7.1.2-4/MagickCore/version-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/version-private.h
rename to ImageMagick-7.1.2-4/MagickCore/version-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/version.c b/ImageMagick-7.1.2-4/MagickCore/version.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/version.c
rename to ImageMagick-7.1.2-4/MagickCore/version.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/vision.c b/ImageMagick-7.1.2-4/MagickCore/vision.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/vision.c
rename to ImageMagick-7.1.2-4/MagickCore/vision.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/vision.h b/ImageMagick-7.1.2-4/MagickCore/vision.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/vision.h
rename to ImageMagick-7.1.2-4/MagickCore/vision.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/visual-effects.c b/ImageMagick-7.1.2-4/MagickCore/visual-effects.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/visual-effects.c
rename to ImageMagick-7.1.2-4/MagickCore/visual-effects.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/visual-effects.h b/ImageMagick-7.1.2-4/MagickCore/visual-effects.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/visual-effects.h
rename to ImageMagick-7.1.2-4/MagickCore/visual-effects.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/vms.c b/ImageMagick-7.1.2-4/MagickCore/vms.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/vms.c
rename to ImageMagick-7.1.2-4/MagickCore/vms.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/vms.h b/ImageMagick-7.1.2-4/MagickCore/vms.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/vms.h
rename to ImageMagick-7.1.2-4/MagickCore/vms.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/widget-private.h b/ImageMagick-7.1.2-4/MagickCore/widget-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/widget-private.h
rename to ImageMagick-7.1.2-4/MagickCore/widget-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/widget.c b/ImageMagick-7.1.2-4/MagickCore/widget.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/widget.c
rename to ImageMagick-7.1.2-4/MagickCore/widget.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/widget.h b/ImageMagick-7.1.2-4/MagickCore/widget.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/widget.h
rename to ImageMagick-7.1.2-4/MagickCore/widget.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/xml-tree-private.h b/ImageMagick-7.1.2-4/MagickCore/xml-tree-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xml-tree-private.h
rename to ImageMagick-7.1.2-4/MagickCore/xml-tree-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/xml-tree.c b/ImageMagick-7.1.2-4/MagickCore/xml-tree.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xml-tree.c
rename to ImageMagick-7.1.2-4/MagickCore/xml-tree.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/xml-tree.h b/ImageMagick-7.1.2-4/MagickCore/xml-tree.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xml-tree.h
rename to ImageMagick-7.1.2-4/MagickCore/xml-tree.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/xwindow-private.h b/ImageMagick-7.1.2-4/MagickCore/xwindow-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xwindow-private.h
rename to ImageMagick-7.1.2-4/MagickCore/xwindow-private.h
diff --git a/ImageMagick-7.1.2-3/MagickCore/xwindow.c b/ImageMagick-7.1.2-4/MagickCore/xwindow.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xwindow.c
rename to ImageMagick-7.1.2-4/MagickCore/xwindow.c
diff --git a/ImageMagick-7.1.2-3/MagickCore/xwindow.h b/ImageMagick-7.1.2-4/MagickCore/xwindow.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickCore/xwindow.h
rename to ImageMagick-7.1.2-4/MagickCore/xwindow.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/MagickWand.h b/ImageMagick-7.1.2-4/MagickWand/MagickWand.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/MagickWand.h
rename to ImageMagick-7.1.2-4/MagickWand/MagickWand.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/animate.c b/ImageMagick-7.1.2-4/MagickWand/animate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/animate.c
rename to ImageMagick-7.1.2-4/MagickWand/animate.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/animate.h b/ImageMagick-7.1.2-4/MagickWand/animate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/animate.h
rename to ImageMagick-7.1.2-4/MagickWand/animate.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/compare.c b/ImageMagick-7.1.2-4/MagickWand/compare.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/compare.c
rename to ImageMagick-7.1.2-4/MagickWand/compare.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/compare.h b/ImageMagick-7.1.2-4/MagickWand/compare.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/compare.h
rename to ImageMagick-7.1.2-4/MagickWand/compare.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/composite.c b/ImageMagick-7.1.2-4/MagickWand/composite.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/composite.c
rename to ImageMagick-7.1.2-4/MagickWand/composite.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/composite.h b/ImageMagick-7.1.2-4/MagickWand/composite.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/composite.h
rename to ImageMagick-7.1.2-4/MagickWand/composite.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/conjure.c b/ImageMagick-7.1.2-4/MagickWand/conjure.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/conjure.c
rename to ImageMagick-7.1.2-4/MagickWand/conjure.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/conjure.h b/ImageMagick-7.1.2-4/MagickWand/conjure.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/conjure.h
rename to ImageMagick-7.1.2-4/MagickWand/conjure.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/deprecate.c b/ImageMagick-7.1.2-4/MagickWand/deprecate.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/deprecate.c
rename to ImageMagick-7.1.2-4/MagickWand/deprecate.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/deprecate.h b/ImageMagick-7.1.2-4/MagickWand/deprecate.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/deprecate.h
rename to ImageMagick-7.1.2-4/MagickWand/deprecate.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/display.c b/ImageMagick-7.1.2-4/MagickWand/display.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/display.c
rename to ImageMagick-7.1.2-4/MagickWand/display.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/display.h b/ImageMagick-7.1.2-4/MagickWand/display.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/display.h
rename to ImageMagick-7.1.2-4/MagickWand/display.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/drawing-wand.c b/ImageMagick-7.1.2-4/MagickWand/drawing-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/drawing-wand.c
rename to ImageMagick-7.1.2-4/MagickWand/drawing-wand.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/drawing-wand.h b/ImageMagick-7.1.2-4/MagickWand/drawing-wand.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/drawing-wand.h
rename to ImageMagick-7.1.2-4/MagickWand/drawing-wand.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/identify.c b/ImageMagick-7.1.2-4/MagickWand/identify.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/identify.c
rename to ImageMagick-7.1.2-4/MagickWand/identify.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/identify.h b/ImageMagick-7.1.2-4/MagickWand/identify.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/identify.h
rename to ImageMagick-7.1.2-4/MagickWand/identify.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/import.c b/ImageMagick-7.1.2-4/MagickWand/import.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/import.c
rename to ImageMagick-7.1.2-4/MagickWand/import.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/import.h b/ImageMagick-7.1.2-4/MagickWand/import.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/import.h
rename to ImageMagick-7.1.2-4/MagickWand/import.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-cli.c b/ImageMagick-7.1.2-4/MagickWand/magick-cli.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-cli.c
rename to ImageMagick-7.1.2-4/MagickWand/magick-cli.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-cli.h b/ImageMagick-7.1.2-4/MagickWand/magick-cli.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-cli.h
rename to ImageMagick-7.1.2-4/MagickWand/magick-cli.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-image.c b/ImageMagick-7.1.2-4/MagickWand/magick-image.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-image.c
rename to ImageMagick-7.1.2-4/MagickWand/magick-image.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-image.h b/ImageMagick-7.1.2-4/MagickWand/magick-image.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-image.h
rename to ImageMagick-7.1.2-4/MagickWand/magick-image.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-property.c b/ImageMagick-7.1.2-4/MagickWand/magick-property.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-property.c
rename to ImageMagick-7.1.2-4/MagickWand/magick-property.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-property.h b/ImageMagick-7.1.2-4/MagickWand/magick-property.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-property.h
rename to ImageMagick-7.1.2-4/MagickWand/magick-property.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-wand-private.h b/ImageMagick-7.1.2-4/MagickWand/magick-wand-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-wand-private.h
rename to ImageMagick-7.1.2-4/MagickWand/magick-wand-private.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/magick-wand.c b/ImageMagick-7.1.2-4/MagickWand/magick-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/magick-wand.c
rename to ImageMagick-7.1.2-4/MagickWand/magick-wand.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/method-attribute.h b/ImageMagick-7.1.2-4/MagickWand/method-attribute.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/method-attribute.h
rename to ImageMagick-7.1.2-4/MagickWand/method-attribute.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/mogrify-private.h b/ImageMagick-7.1.2-4/MagickWand/mogrify-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/mogrify-private.h
rename to ImageMagick-7.1.2-4/MagickWand/mogrify-private.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/mogrify.c b/ImageMagick-7.1.2-4/MagickWand/mogrify.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/mogrify.c
rename to ImageMagick-7.1.2-4/MagickWand/mogrify.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/mogrify.h b/ImageMagick-7.1.2-4/MagickWand/mogrify.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/mogrify.h
rename to ImageMagick-7.1.2-4/MagickWand/mogrify.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/montage.c b/ImageMagick-7.1.2-4/MagickWand/montage.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/montage.c
rename to ImageMagick-7.1.2-4/MagickWand/montage.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/montage.h b/ImageMagick-7.1.2-4/MagickWand/montage.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/montage.h
rename to ImageMagick-7.1.2-4/MagickWand/montage.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/operation-private.h b/ImageMagick-7.1.2-4/MagickWand/operation-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/operation-private.h
rename to ImageMagick-7.1.2-4/MagickWand/operation-private.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/operation.c b/ImageMagick-7.1.2-4/MagickWand/operation.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/operation.c
rename to ImageMagick-7.1.2-4/MagickWand/operation.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/operation.h b/ImageMagick-7.1.2-4/MagickWand/operation.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/operation.h
rename to ImageMagick-7.1.2-4/MagickWand/operation.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/pixel-iterator.c b/ImageMagick-7.1.2-4/MagickWand/pixel-iterator.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/pixel-iterator.c
rename to ImageMagick-7.1.2-4/MagickWand/pixel-iterator.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/pixel-iterator.h b/ImageMagick-7.1.2-4/MagickWand/pixel-iterator.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/pixel-iterator.h
rename to ImageMagick-7.1.2-4/MagickWand/pixel-iterator.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/pixel-wand-private.h b/ImageMagick-7.1.2-4/MagickWand/pixel-wand-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/pixel-wand-private.h
rename to ImageMagick-7.1.2-4/MagickWand/pixel-wand-private.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/pixel-wand.c b/ImageMagick-7.1.2-4/MagickWand/pixel-wand.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/pixel-wand.c
rename to ImageMagick-7.1.2-4/MagickWand/pixel-wand.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/pixel-wand.h b/ImageMagick-7.1.2-4/MagickWand/pixel-wand.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/pixel-wand.h
rename to ImageMagick-7.1.2-4/MagickWand/pixel-wand.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/script-token.c b/ImageMagick-7.1.2-4/MagickWand/script-token.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/script-token.c
rename to ImageMagick-7.1.2-4/MagickWand/script-token.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/script-token.h b/ImageMagick-7.1.2-4/MagickWand/script-token.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/script-token.h
rename to ImageMagick-7.1.2-4/MagickWand/script-token.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/stream.c b/ImageMagick-7.1.2-4/MagickWand/stream.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/stream.c
rename to ImageMagick-7.1.2-4/MagickWand/stream.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/stream.h b/ImageMagick-7.1.2-4/MagickWand/stream.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/stream.h
rename to ImageMagick-7.1.2-4/MagickWand/stream.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/studio.h b/ImageMagick-7.1.2-4/MagickWand/studio.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/studio.h
rename to ImageMagick-7.1.2-4/MagickWand/studio.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/wand-view.c b/ImageMagick-7.1.2-4/MagickWand/wand-view.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wand-view.c
rename to ImageMagick-7.1.2-4/MagickWand/wand-view.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/wand-view.h b/ImageMagick-7.1.2-4/MagickWand/wand-view.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wand-view.h
rename to ImageMagick-7.1.2-4/MagickWand/wand-view.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/wand.c b/ImageMagick-7.1.2-4/MagickWand/wand.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wand.c
rename to ImageMagick-7.1.2-4/MagickWand/wand.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/wand.h b/ImageMagick-7.1.2-4/MagickWand/wand.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wand.h
rename to ImageMagick-7.1.2-4/MagickWand/wand.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/wandcli-private.h b/ImageMagick-7.1.2-4/MagickWand/wandcli-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wandcli-private.h
rename to ImageMagick-7.1.2-4/MagickWand/wandcli-private.h
diff --git a/ImageMagick-7.1.2-3/MagickWand/wandcli.c b/ImageMagick-7.1.2-4/MagickWand/wandcli.c
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wandcli.c
rename to ImageMagick-7.1.2-4/MagickWand/wandcli.c
diff --git a/ImageMagick-7.1.2-3/MagickWand/wandcli.h b/ImageMagick-7.1.2-4/MagickWand/wandcli.h
similarity index 100%
rename from ImageMagick-7.1.2-3/MagickWand/wandcli.h
rename to ImageMagick-7.1.2-4/MagickWand/wandcli.h
diff --git a/ImageMagick-7.1.2-3/coders/aai.c b/ImageMagick-7.1.2-4/coders/aai.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/aai.c
rename to ImageMagick-7.1.2-4/coders/aai.c
diff --git a/ImageMagick-7.1.2-3/coders/aai.h b/ImageMagick-7.1.2-4/coders/aai.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/aai.h
rename to ImageMagick-7.1.2-4/coders/aai.h
diff --git a/ImageMagick-7.1.2-3/coders/art.c b/ImageMagick-7.1.2-4/coders/art.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/art.c
rename to ImageMagick-7.1.2-4/coders/art.c
diff --git a/ImageMagick-7.1.2-3/coders/art.h b/ImageMagick-7.1.2-4/coders/art.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/art.h
rename to ImageMagick-7.1.2-4/coders/art.h
diff --git a/ImageMagick-7.1.2-3/coders/ashlar.c b/ImageMagick-7.1.2-4/coders/ashlar.c
similarity index 98%
rename from ImageMagick-7.1.2-3/coders/ashlar.c
rename to ImageMagick-7.1.2-4/coders/ashlar.c
index 9124cb61e..941ffa507 100644
--- a/ImageMagick-7.1.2-3/coders/ashlar.c
+++ b/ImageMagick-7.1.2-4/coders/ashlar.c
@@ -172,14 +172,12 @@ typedef struct _AshlarInfo
 {
   size_t
     width,
-    height;
+    height,
+    number_nodes;
 
   ssize_t
     align;
 
-  size_t
-    number_nodes;
-
   MagickBooleanType
     best_fit;
 
@@ -548,8 +546,8 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
       }
       geometry.width=(size_t) geometry.width/7;
       geometry.height=(size_t) geometry.height/7;
-      geometry.x=(ssize_t) pow((double) geometry.width,0.25);
-      geometry.y=(ssize_t) pow((double) geometry.height,0.25);
+      geometry.x=(ssize_t) pow((double) geometry.width,0.4);
+      geometry.y=(ssize_t) pow((double) geometry.height,0.4);
       image_info->extract=AcquireString("");
       if (image_info->extract != (char *) NULL)
         (void) FormatLocaleString(image_info->extract,MagickPathExtent,
@@ -666,10 +664,9 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
           {
             (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);
+              tiles[i].x+geometry.x,(double) tiles[i].height+tiles[i].y-
+              geometry.y/2.0+4);
             (void) CloneString(&draw_info->geometry,offset);
             status=AnnotateImage(ashlar_image,draw_info,exception);
           }
@@ -686,6 +683,8 @@ static Image *ASHLARImage(ImageInfo *image_info,Image *image,
     }
     tile_image=DestroyImage(tile_image);
   }
+  if (image_info->extract != (char *) NULL)
+    (void) ParseAbsoluteGeometry(image_info->extract,&extent);
   (void) SetImageExtent(ashlar_image,extent.width,extent.height,exception);
   nodes=(NodeInfo *) RelinquishMagickMemory(nodes);
   tiles=(CanvasInfo *) RelinquishMagickMemory(tiles);
diff --git a/ImageMagick-7.1.2-3/coders/ashlar.h b/ImageMagick-7.1.2-4/coders/ashlar.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ashlar.h
rename to ImageMagick-7.1.2-4/coders/ashlar.h
diff --git a/ImageMagick-7.1.2-3/coders/avs.c b/ImageMagick-7.1.2-4/coders/avs.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/avs.c
rename to ImageMagick-7.1.2-4/coders/avs.c
diff --git a/ImageMagick-7.1.2-3/coders/avs.h b/ImageMagick-7.1.2-4/coders/avs.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/avs.h
rename to ImageMagick-7.1.2-4/coders/avs.h
diff --git a/ImageMagick-7.1.2-3/coders/bayer.c b/ImageMagick-7.1.2-4/coders/bayer.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bayer.c
rename to ImageMagick-7.1.2-4/coders/bayer.c
diff --git a/ImageMagick-7.1.2-3/coders/bayer.h b/ImageMagick-7.1.2-4/coders/bayer.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bayer.h
rename to ImageMagick-7.1.2-4/coders/bayer.h
diff --git a/ImageMagick-7.1.2-3/coders/bgr.c b/ImageMagick-7.1.2-4/coders/bgr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bgr.c
rename to ImageMagick-7.1.2-4/coders/bgr.c
diff --git a/ImageMagick-7.1.2-3/coders/bgr.h b/ImageMagick-7.1.2-4/coders/bgr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bgr.h
rename to ImageMagick-7.1.2-4/coders/bgr.h
diff --git a/ImageMagick-7.1.2-3/coders/bmp.c b/ImageMagick-7.1.2-4/coders/bmp.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bmp.c
rename to ImageMagick-7.1.2-4/coders/bmp.c
diff --git a/ImageMagick-7.1.2-3/coders/bmp.h b/ImageMagick-7.1.2-4/coders/bmp.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bmp.h
rename to ImageMagick-7.1.2-4/coders/bmp.h
diff --git a/ImageMagick-7.1.2-3/coders/braille.c b/ImageMagick-7.1.2-4/coders/braille.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/braille.c
rename to ImageMagick-7.1.2-4/coders/braille.c
diff --git a/ImageMagick-7.1.2-3/coders/braille.h b/ImageMagick-7.1.2-4/coders/braille.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/braille.h
rename to ImageMagick-7.1.2-4/coders/braille.h
diff --git a/ImageMagick-7.1.2-3/coders/bytebuffer-private.h b/ImageMagick-7.1.2-4/coders/bytebuffer-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/bytebuffer-private.h
rename to ImageMagick-7.1.2-4/coders/bytebuffer-private.h
diff --git a/ImageMagick-7.1.2-3/coders/cals.c b/ImageMagick-7.1.2-4/coders/cals.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cals.c
rename to ImageMagick-7.1.2-4/coders/cals.c
diff --git a/ImageMagick-7.1.2-3/coders/cals.h b/ImageMagick-7.1.2-4/coders/cals.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cals.h
rename to ImageMagick-7.1.2-4/coders/cals.h
diff --git a/ImageMagick-7.1.2-3/coders/caption.c b/ImageMagick-7.1.2-4/coders/caption.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/caption.c
rename to ImageMagick-7.1.2-4/coders/caption.c
diff --git a/ImageMagick-7.1.2-3/coders/caption.h b/ImageMagick-7.1.2-4/coders/caption.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/caption.h
rename to ImageMagick-7.1.2-4/coders/caption.h
diff --git a/ImageMagick-7.1.2-3/coders/cin.c b/ImageMagick-7.1.2-4/coders/cin.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cin.c
rename to ImageMagick-7.1.2-4/coders/cin.c
diff --git a/ImageMagick-7.1.2-3/coders/cin.h b/ImageMagick-7.1.2-4/coders/cin.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cin.h
rename to ImageMagick-7.1.2-4/coders/cin.h
diff --git a/ImageMagick-7.1.2-3/coders/cip.c b/ImageMagick-7.1.2-4/coders/cip.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cip.c
rename to ImageMagick-7.1.2-4/coders/cip.c
diff --git a/ImageMagick-7.1.2-3/coders/cip.h b/ImageMagick-7.1.2-4/coders/cip.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cip.h
rename to ImageMagick-7.1.2-4/coders/cip.h
diff --git a/ImageMagick-7.1.2-3/coders/clip.c b/ImageMagick-7.1.2-4/coders/clip.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/clip.c
rename to ImageMagick-7.1.2-4/coders/clip.c
diff --git a/ImageMagick-7.1.2-3/coders/clip.h b/ImageMagick-7.1.2-4/coders/clip.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/clip.h
rename to ImageMagick-7.1.2-4/coders/clip.h
diff --git a/ImageMagick-7.1.2-3/coders/clipboard.c b/ImageMagick-7.1.2-4/coders/clipboard.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/clipboard.c
rename to ImageMagick-7.1.2-4/coders/clipboard.c
diff --git a/ImageMagick-7.1.2-3/coders/clipboard.h b/ImageMagick-7.1.2-4/coders/clipboard.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/clipboard.h
rename to ImageMagick-7.1.2-4/coders/clipboard.h
diff --git a/ImageMagick-7.1.2-3/coders/cmyk.c b/ImageMagick-7.1.2-4/coders/cmyk.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cmyk.c
rename to ImageMagick-7.1.2-4/coders/cmyk.c
diff --git a/ImageMagick-7.1.2-3/coders/cmyk.h b/ImageMagick-7.1.2-4/coders/cmyk.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cmyk.h
rename to ImageMagick-7.1.2-4/coders/cmyk.h
diff --git a/ImageMagick-7.1.2-3/coders/coders-list.h b/ImageMagick-7.1.2-4/coders/coders-list.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/coders-list.h
rename to ImageMagick-7.1.2-4/coders/coders-list.h
diff --git a/ImageMagick-7.1.2-3/coders/coders-private.h b/ImageMagick-7.1.2-4/coders/coders-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/coders-private.h
rename to ImageMagick-7.1.2-4/coders/coders-private.h
diff --git a/ImageMagick-7.1.2-3/coders/coders.h b/ImageMagick-7.1.2-4/coders/coders.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/coders.h
rename to ImageMagick-7.1.2-4/coders/coders.h
diff --git a/ImageMagick-7.1.2-3/coders/cube.c b/ImageMagick-7.1.2-4/coders/cube.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cube.c
rename to ImageMagick-7.1.2-4/coders/cube.c
diff --git a/ImageMagick-7.1.2-3/coders/cube.h b/ImageMagick-7.1.2-4/coders/cube.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cube.h
rename to ImageMagick-7.1.2-4/coders/cube.h
diff --git a/ImageMagick-7.1.2-3/coders/cut.c b/ImageMagick-7.1.2-4/coders/cut.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cut.c
rename to ImageMagick-7.1.2-4/coders/cut.c
diff --git a/ImageMagick-7.1.2-3/coders/cut.h b/ImageMagick-7.1.2-4/coders/cut.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/cut.h
rename to ImageMagick-7.1.2-4/coders/cut.h
diff --git a/ImageMagick-7.1.2-3/coders/dcm.c b/ImageMagick-7.1.2-4/coders/dcm.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dcm.c
rename to ImageMagick-7.1.2-4/coders/dcm.c
diff --git a/ImageMagick-7.1.2-3/coders/dcm.h b/ImageMagick-7.1.2-4/coders/dcm.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dcm.h
rename to ImageMagick-7.1.2-4/coders/dcm.h
diff --git a/ImageMagick-7.1.2-3/coders/dds.c b/ImageMagick-7.1.2-4/coders/dds.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dds.c
rename to ImageMagick-7.1.2-4/coders/dds.c
diff --git a/ImageMagick-7.1.2-3/coders/dds.h b/ImageMagick-7.1.2-4/coders/dds.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dds.h
rename to ImageMagick-7.1.2-4/coders/dds.h
diff --git a/ImageMagick-7.1.2-3/coders/debug.c b/ImageMagick-7.1.2-4/coders/debug.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/debug.c
rename to ImageMagick-7.1.2-4/coders/debug.c
diff --git a/ImageMagick-7.1.2-3/coders/debug.h b/ImageMagick-7.1.2-4/coders/debug.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/debug.h
rename to ImageMagick-7.1.2-4/coders/debug.h
diff --git a/ImageMagick-7.1.2-3/coders/dib.c b/ImageMagick-7.1.2-4/coders/dib.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dib.c
rename to ImageMagick-7.1.2-4/coders/dib.c
diff --git a/ImageMagick-7.1.2-3/coders/dib.h b/ImageMagick-7.1.2-4/coders/dib.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dib.h
rename to ImageMagick-7.1.2-4/coders/dib.h
diff --git a/ImageMagick-7.1.2-3/coders/djvu.c b/ImageMagick-7.1.2-4/coders/djvu.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/djvu.c
rename to ImageMagick-7.1.2-4/coders/djvu.c
diff --git a/ImageMagick-7.1.2-3/coders/djvu.h b/ImageMagick-7.1.2-4/coders/djvu.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/djvu.h
rename to ImageMagick-7.1.2-4/coders/djvu.h
diff --git a/ImageMagick-7.1.2-3/coders/dmr.c b/ImageMagick-7.1.2-4/coders/dmr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dmr.c
rename to ImageMagick-7.1.2-4/coders/dmr.c
diff --git a/ImageMagick-7.1.2-3/coders/dmr.h b/ImageMagick-7.1.2-4/coders/dmr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dmr.h
rename to ImageMagick-7.1.2-4/coders/dmr.h
diff --git a/ImageMagick-7.1.2-3/coders/dng.c b/ImageMagick-7.1.2-4/coders/dng.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dng.c
rename to ImageMagick-7.1.2-4/coders/dng.c
diff --git a/ImageMagick-7.1.2-3/coders/dng.h b/ImageMagick-7.1.2-4/coders/dng.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dng.h
rename to ImageMagick-7.1.2-4/coders/dng.h
diff --git a/ImageMagick-7.1.2-3/coders/dot.c b/ImageMagick-7.1.2-4/coders/dot.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dot.c
rename to ImageMagick-7.1.2-4/coders/dot.c
diff --git a/ImageMagick-7.1.2-3/coders/dot.h b/ImageMagick-7.1.2-4/coders/dot.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dot.h
rename to ImageMagick-7.1.2-4/coders/dot.h
diff --git a/ImageMagick-7.1.2-3/coders/dps.c b/ImageMagick-7.1.2-4/coders/dps.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dps.c
rename to ImageMagick-7.1.2-4/coders/dps.c
diff --git a/ImageMagick-7.1.2-3/coders/dps.h b/ImageMagick-7.1.2-4/coders/dps.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dps.h
rename to ImageMagick-7.1.2-4/coders/dps.h
diff --git a/ImageMagick-7.1.2-3/coders/dpx.c b/ImageMagick-7.1.2-4/coders/dpx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dpx.c
rename to ImageMagick-7.1.2-4/coders/dpx.c
diff --git a/ImageMagick-7.1.2-3/coders/dpx.h b/ImageMagick-7.1.2-4/coders/dpx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/dpx.h
rename to ImageMagick-7.1.2-4/coders/dpx.h
diff --git a/ImageMagick-7.1.2-3/coders/emf.c b/ImageMagick-7.1.2-4/coders/emf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/emf.c
rename to ImageMagick-7.1.2-4/coders/emf.c
diff --git a/ImageMagick-7.1.2-3/coders/emf.h b/ImageMagick-7.1.2-4/coders/emf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/emf.h
rename to ImageMagick-7.1.2-4/coders/emf.h
diff --git a/ImageMagick-7.1.2-3/coders/ept.c b/ImageMagick-7.1.2-4/coders/ept.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ept.c
rename to ImageMagick-7.1.2-4/coders/ept.c
diff --git a/ImageMagick-7.1.2-3/coders/ept.h b/ImageMagick-7.1.2-4/coders/ept.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ept.h
rename to ImageMagick-7.1.2-4/coders/ept.h
diff --git a/ImageMagick-7.1.2-3/coders/exr.c b/ImageMagick-7.1.2-4/coders/exr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/exr.c
rename to ImageMagick-7.1.2-4/coders/exr.c
diff --git a/ImageMagick-7.1.2-3/coders/exr.h b/ImageMagick-7.1.2-4/coders/exr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/exr.h
rename to ImageMagick-7.1.2-4/coders/exr.h
diff --git a/ImageMagick-7.1.2-3/coders/farbfeld.c b/ImageMagick-7.1.2-4/coders/farbfeld.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/farbfeld.c
rename to ImageMagick-7.1.2-4/coders/farbfeld.c
diff --git a/ImageMagick-7.1.2-3/coders/farbfeld.h b/ImageMagick-7.1.2-4/coders/farbfeld.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/farbfeld.h
rename to ImageMagick-7.1.2-4/coders/farbfeld.h
diff --git a/ImageMagick-7.1.2-3/coders/fax.c b/ImageMagick-7.1.2-4/coders/fax.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fax.c
rename to ImageMagick-7.1.2-4/coders/fax.c
diff --git a/ImageMagick-7.1.2-3/coders/fax.h b/ImageMagick-7.1.2-4/coders/fax.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fax.h
rename to ImageMagick-7.1.2-4/coders/fax.h
diff --git a/ImageMagick-7.1.2-3/coders/fits.c b/ImageMagick-7.1.2-4/coders/fits.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fits.c
rename to ImageMagick-7.1.2-4/coders/fits.c
diff --git a/ImageMagick-7.1.2-3/coders/fits.h b/ImageMagick-7.1.2-4/coders/fits.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fits.h
rename to ImageMagick-7.1.2-4/coders/fits.h
diff --git a/ImageMagick-7.1.2-3/coders/fl32.c b/ImageMagick-7.1.2-4/coders/fl32.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fl32.c
rename to ImageMagick-7.1.2-4/coders/fl32.c
diff --git a/ImageMagick-7.1.2-3/coders/fl32.h b/ImageMagick-7.1.2-4/coders/fl32.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fl32.h
rename to ImageMagick-7.1.2-4/coders/fl32.h
diff --git a/ImageMagick-7.1.2-3/coders/flif.c b/ImageMagick-7.1.2-4/coders/flif.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/flif.c
rename to ImageMagick-7.1.2-4/coders/flif.c
diff --git a/ImageMagick-7.1.2-3/coders/flif.h b/ImageMagick-7.1.2-4/coders/flif.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/flif.h
rename to ImageMagick-7.1.2-4/coders/flif.h
diff --git a/ImageMagick-7.1.2-3/coders/fpx.c b/ImageMagick-7.1.2-4/coders/fpx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fpx.c
rename to ImageMagick-7.1.2-4/coders/fpx.c
diff --git a/ImageMagick-7.1.2-3/coders/fpx.h b/ImageMagick-7.1.2-4/coders/fpx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/fpx.h
rename to ImageMagick-7.1.2-4/coders/fpx.h
diff --git a/ImageMagick-7.1.2-3/coders/ftxt.c b/ImageMagick-7.1.2-4/coders/ftxt.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ftxt.c
rename to ImageMagick-7.1.2-4/coders/ftxt.c
diff --git a/ImageMagick-7.1.2-3/coders/ftxt.h b/ImageMagick-7.1.2-4/coders/ftxt.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ftxt.h
rename to ImageMagick-7.1.2-4/coders/ftxt.h
diff --git a/ImageMagick-7.1.2-3/coders/ghostscript-private.h b/ImageMagick-7.1.2-4/coders/ghostscript-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ghostscript-private.h
rename to ImageMagick-7.1.2-4/coders/ghostscript-private.h
diff --git a/ImageMagick-7.1.2-3/coders/gif.c b/ImageMagick-7.1.2-4/coders/gif.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gif.c
rename to ImageMagick-7.1.2-4/coders/gif.c
diff --git a/ImageMagick-7.1.2-3/coders/gif.h b/ImageMagick-7.1.2-4/coders/gif.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gif.h
rename to ImageMagick-7.1.2-4/coders/gif.h
diff --git a/ImageMagick-7.1.2-3/coders/gradient.c b/ImageMagick-7.1.2-4/coders/gradient.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gradient.c
rename to ImageMagick-7.1.2-4/coders/gradient.c
diff --git a/ImageMagick-7.1.2-3/coders/gradient.h b/ImageMagick-7.1.2-4/coders/gradient.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gradient.h
rename to ImageMagick-7.1.2-4/coders/gradient.h
diff --git a/ImageMagick-7.1.2-3/coders/gray.c b/ImageMagick-7.1.2-4/coders/gray.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gray.c
rename to ImageMagick-7.1.2-4/coders/gray.c
diff --git a/ImageMagick-7.1.2-3/coders/gray.h b/ImageMagick-7.1.2-4/coders/gray.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/gray.h
rename to ImageMagick-7.1.2-4/coders/gray.h
diff --git a/ImageMagick-7.1.2-3/coders/hald.c b/ImageMagick-7.1.2-4/coders/hald.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hald.c
rename to ImageMagick-7.1.2-4/coders/hald.c
diff --git a/ImageMagick-7.1.2-3/coders/hald.h b/ImageMagick-7.1.2-4/coders/hald.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hald.h
rename to ImageMagick-7.1.2-4/coders/hald.h
diff --git a/ImageMagick-7.1.2-3/coders/hdr.c b/ImageMagick-7.1.2-4/coders/hdr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hdr.c
rename to ImageMagick-7.1.2-4/coders/hdr.c
diff --git a/ImageMagick-7.1.2-3/coders/hdr.h b/ImageMagick-7.1.2-4/coders/hdr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hdr.h
rename to ImageMagick-7.1.2-4/coders/hdr.h
diff --git a/ImageMagick-7.1.2-3/coders/heic.c b/ImageMagick-7.1.2-4/coders/heic.c
similarity index 99%
rename from ImageMagick-7.1.2-3/coders/heic.c
rename to ImageMagick-7.1.2-4/coders/heic.c
index a7e8817fa..7676e9a97 100644
--- a/ImageMagick-7.1.2-3/coders/heic.c
+++ b/ImageMagick-7.1.2-4/coders/heic.c
@@ -422,6 +422,9 @@ static MagickBooleanType ReadHEICImageHandle(const ImageInfo *image_info,
   else
     {
 #if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,17,0)
+      enum heif_item_property_type
+        type = heif_item_property_type_invalid;
+
       heif_item_id
         item_id;
 
@@ -435,6 +438,9 @@ static MagickBooleanType ReadHEICImageHandle(const ImageInfo *image_info,
       count=heif_item_get_transformation_properties(heif_context,item_id,
         transforms,1);
       if (count == 1)
+        type=heif_item_get_property_type(heif_context,item_id,transforms[0]);
+      if (count == 1 && ((type == heif_item_property_type_transform_mirror) ||
+          (type == heif_item_property_type_transform_rotation)))
         {
           enum heif_transform_mirror_direction
             mirror;
diff --git a/ImageMagick-7.1.2-3/coders/heic.h b/ImageMagick-7.1.2-4/coders/heic.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/heic.h
rename to ImageMagick-7.1.2-4/coders/heic.h
diff --git a/ImageMagick-7.1.2-3/coders/histogram.c b/ImageMagick-7.1.2-4/coders/histogram.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/histogram.c
rename to ImageMagick-7.1.2-4/coders/histogram.c
diff --git a/ImageMagick-7.1.2-3/coders/histogram.h b/ImageMagick-7.1.2-4/coders/histogram.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/histogram.h
rename to ImageMagick-7.1.2-4/coders/histogram.h
diff --git a/ImageMagick-7.1.2-3/coders/hrz.c b/ImageMagick-7.1.2-4/coders/hrz.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hrz.c
rename to ImageMagick-7.1.2-4/coders/hrz.c
diff --git a/ImageMagick-7.1.2-3/coders/hrz.h b/ImageMagick-7.1.2-4/coders/hrz.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/hrz.h
rename to ImageMagick-7.1.2-4/coders/hrz.h
diff --git a/ImageMagick-7.1.2-3/coders/html.c b/ImageMagick-7.1.2-4/coders/html.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/html.c
rename to ImageMagick-7.1.2-4/coders/html.c
diff --git a/ImageMagick-7.1.2-3/coders/html.h b/ImageMagick-7.1.2-4/coders/html.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/html.h
rename to ImageMagick-7.1.2-4/coders/html.h
diff --git a/ImageMagick-7.1.2-3/coders/icon.c b/ImageMagick-7.1.2-4/coders/icon.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/icon.c
rename to ImageMagick-7.1.2-4/coders/icon.c
diff --git a/ImageMagick-7.1.2-3/coders/icon.h b/ImageMagick-7.1.2-4/coders/icon.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/icon.h
rename to ImageMagick-7.1.2-4/coders/icon.h
diff --git a/ImageMagick-7.1.2-3/coders/info.c b/ImageMagick-7.1.2-4/coders/info.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/info.c
rename to ImageMagick-7.1.2-4/coders/info.c
diff --git a/ImageMagick-7.1.2-3/coders/info.h b/ImageMagick-7.1.2-4/coders/info.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/info.h
rename to ImageMagick-7.1.2-4/coders/info.h
diff --git a/ImageMagick-7.1.2-3/coders/inline.c b/ImageMagick-7.1.2-4/coders/inline.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/inline.c
rename to ImageMagick-7.1.2-4/coders/inline.c
diff --git a/ImageMagick-7.1.2-3/coders/inline.h b/ImageMagick-7.1.2-4/coders/inline.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/inline.h
rename to ImageMagick-7.1.2-4/coders/inline.h
diff --git a/ImageMagick-7.1.2-3/coders/ipl.c b/ImageMagick-7.1.2-4/coders/ipl.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ipl.c
rename to ImageMagick-7.1.2-4/coders/ipl.c
diff --git a/ImageMagick-7.1.2-3/coders/ipl.h b/ImageMagick-7.1.2-4/coders/ipl.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ipl.h
rename to ImageMagick-7.1.2-4/coders/ipl.h
diff --git a/ImageMagick-7.1.2-3/coders/jbig.c b/ImageMagick-7.1.2-4/coders/jbig.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jbig.c
rename to ImageMagick-7.1.2-4/coders/jbig.c
diff --git a/ImageMagick-7.1.2-3/coders/jbig.h b/ImageMagick-7.1.2-4/coders/jbig.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jbig.h
rename to ImageMagick-7.1.2-4/coders/jbig.h
diff --git a/ImageMagick-7.1.2-3/coders/jnx.c b/ImageMagick-7.1.2-4/coders/jnx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jnx.c
rename to ImageMagick-7.1.2-4/coders/jnx.c
diff --git a/ImageMagick-7.1.2-3/coders/jnx.h b/ImageMagick-7.1.2-4/coders/jnx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jnx.h
rename to ImageMagick-7.1.2-4/coders/jnx.h
diff --git a/ImageMagick-7.1.2-3/coders/jp2.c b/ImageMagick-7.1.2-4/coders/jp2.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jp2.c
rename to ImageMagick-7.1.2-4/coders/jp2.c
diff --git a/ImageMagick-7.1.2-3/coders/jp2.h b/ImageMagick-7.1.2-4/coders/jp2.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jp2.h
rename to ImageMagick-7.1.2-4/coders/jp2.h
diff --git a/ImageMagick-7.1.2-3/coders/jpeg.c b/ImageMagick-7.1.2-4/coders/jpeg.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jpeg.c
rename to ImageMagick-7.1.2-4/coders/jpeg.c
diff --git a/ImageMagick-7.1.2-3/coders/jpeg.h b/ImageMagick-7.1.2-4/coders/jpeg.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jpeg.h
rename to ImageMagick-7.1.2-4/coders/jpeg.h
diff --git a/ImageMagick-7.1.2-3/coders/json.c b/ImageMagick-7.1.2-4/coders/json.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/json.c
rename to ImageMagick-7.1.2-4/coders/json.c
diff --git a/ImageMagick-7.1.2-3/coders/json.h b/ImageMagick-7.1.2-4/coders/json.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/json.h
rename to ImageMagick-7.1.2-4/coders/json.h
diff --git a/ImageMagick-7.1.2-3/coders/jxl.c b/ImageMagick-7.1.2-4/coders/jxl.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jxl.c
rename to ImageMagick-7.1.2-4/coders/jxl.c
diff --git a/ImageMagick-7.1.2-3/coders/jxl.h b/ImageMagick-7.1.2-4/coders/jxl.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/jxl.h
rename to ImageMagick-7.1.2-4/coders/jxl.h
diff --git a/ImageMagick-7.1.2-3/coders/kernel.c b/ImageMagick-7.1.2-4/coders/kernel.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/kernel.c
rename to ImageMagick-7.1.2-4/coders/kernel.c
diff --git a/ImageMagick-7.1.2-3/coders/kernel.h b/ImageMagick-7.1.2-4/coders/kernel.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/kernel.h
rename to ImageMagick-7.1.2-4/coders/kernel.h
diff --git a/ImageMagick-7.1.2-3/coders/label.c b/ImageMagick-7.1.2-4/coders/label.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/label.c
rename to ImageMagick-7.1.2-4/coders/label.c
diff --git a/ImageMagick-7.1.2-3/coders/label.h b/ImageMagick-7.1.2-4/coders/label.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/label.h
rename to ImageMagick-7.1.2-4/coders/label.h
diff --git a/ImageMagick-7.1.2-3/coders/mac.c b/ImageMagick-7.1.2-4/coders/mac.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mac.c
rename to ImageMagick-7.1.2-4/coders/mac.c
diff --git a/ImageMagick-7.1.2-3/coders/mac.h b/ImageMagick-7.1.2-4/coders/mac.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mac.h
rename to ImageMagick-7.1.2-4/coders/mac.h
diff --git a/ImageMagick-7.1.2-3/coders/magick.c b/ImageMagick-7.1.2-4/coders/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/magick.c
rename to ImageMagick-7.1.2-4/coders/magick.c
diff --git a/ImageMagick-7.1.2-3/coders/magick.h b/ImageMagick-7.1.2-4/coders/magick.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/magick.h
rename to ImageMagick-7.1.2-4/coders/magick.h
diff --git a/ImageMagick-7.1.2-3/coders/map.c b/ImageMagick-7.1.2-4/coders/map.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/map.c
rename to ImageMagick-7.1.2-4/coders/map.c
diff --git a/ImageMagick-7.1.2-3/coders/map.h b/ImageMagick-7.1.2-4/coders/map.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/map.h
rename to ImageMagick-7.1.2-4/coders/map.h
diff --git a/ImageMagick-7.1.2-3/coders/mask.c b/ImageMagick-7.1.2-4/coders/mask.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mask.c
rename to ImageMagick-7.1.2-4/coders/mask.c
diff --git a/ImageMagick-7.1.2-3/coders/mask.h b/ImageMagick-7.1.2-4/coders/mask.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mask.h
rename to ImageMagick-7.1.2-4/coders/mask.h
diff --git a/ImageMagick-7.1.2-3/coders/mat.c b/ImageMagick-7.1.2-4/coders/mat.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mat.c
rename to ImageMagick-7.1.2-4/coders/mat.c
diff --git a/ImageMagick-7.1.2-3/coders/mat.h b/ImageMagick-7.1.2-4/coders/mat.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mat.h
rename to ImageMagick-7.1.2-4/coders/mat.h
diff --git a/ImageMagick-7.1.2-3/coders/matte.c b/ImageMagick-7.1.2-4/coders/matte.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/matte.c
rename to ImageMagick-7.1.2-4/coders/matte.c
diff --git a/ImageMagick-7.1.2-3/coders/matte.h b/ImageMagick-7.1.2-4/coders/matte.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/matte.h
rename to ImageMagick-7.1.2-4/coders/matte.h
diff --git a/ImageMagick-7.1.2-3/coders/meta.c b/ImageMagick-7.1.2-4/coders/meta.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/meta.c
rename to ImageMagick-7.1.2-4/coders/meta.c
diff --git a/ImageMagick-7.1.2-3/coders/meta.h b/ImageMagick-7.1.2-4/coders/meta.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/meta.h
rename to ImageMagick-7.1.2-4/coders/meta.h
diff --git a/ImageMagick-7.1.2-3/coders/miff.c b/ImageMagick-7.1.2-4/coders/miff.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/miff.c
rename to ImageMagick-7.1.2-4/coders/miff.c
diff --git a/ImageMagick-7.1.2-3/coders/miff.h b/ImageMagick-7.1.2-4/coders/miff.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/miff.h
rename to ImageMagick-7.1.2-4/coders/miff.h
diff --git a/ImageMagick-7.1.2-3/coders/mono.c b/ImageMagick-7.1.2-4/coders/mono.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mono.c
rename to ImageMagick-7.1.2-4/coders/mono.c
diff --git a/ImageMagick-7.1.2-3/coders/mono.h b/ImageMagick-7.1.2-4/coders/mono.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mono.h
rename to ImageMagick-7.1.2-4/coders/mono.h
diff --git a/ImageMagick-7.1.2-3/coders/mpc.c b/ImageMagick-7.1.2-4/coders/mpc.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mpc.c
rename to ImageMagick-7.1.2-4/coders/mpc.c
diff --git a/ImageMagick-7.1.2-3/coders/mpc.h b/ImageMagick-7.1.2-4/coders/mpc.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mpc.h
rename to ImageMagick-7.1.2-4/coders/mpc.h
diff --git a/ImageMagick-7.1.2-3/coders/mpr.c b/ImageMagick-7.1.2-4/coders/mpr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mpr.c
rename to ImageMagick-7.1.2-4/coders/mpr.c
diff --git a/ImageMagick-7.1.2-3/coders/mpr.h b/ImageMagick-7.1.2-4/coders/mpr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mpr.h
rename to ImageMagick-7.1.2-4/coders/mpr.h
diff --git a/ImageMagick-7.1.2-3/coders/msl.c b/ImageMagick-7.1.2-4/coders/msl.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/msl.c
rename to ImageMagick-7.1.2-4/coders/msl.c
diff --git a/ImageMagick-7.1.2-3/coders/msl.h b/ImageMagick-7.1.2-4/coders/msl.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/msl.h
rename to ImageMagick-7.1.2-4/coders/msl.h
diff --git a/ImageMagick-7.1.2-3/coders/mtv.c b/ImageMagick-7.1.2-4/coders/mtv.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mtv.c
rename to ImageMagick-7.1.2-4/coders/mtv.c
diff --git a/ImageMagick-7.1.2-3/coders/mtv.h b/ImageMagick-7.1.2-4/coders/mtv.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mtv.h
rename to ImageMagick-7.1.2-4/coders/mtv.h
diff --git a/ImageMagick-7.1.2-3/coders/mvg.c b/ImageMagick-7.1.2-4/coders/mvg.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mvg.c
rename to ImageMagick-7.1.2-4/coders/mvg.c
diff --git a/ImageMagick-7.1.2-3/coders/mvg.h b/ImageMagick-7.1.2-4/coders/mvg.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/mvg.h
rename to ImageMagick-7.1.2-4/coders/mvg.h
diff --git a/ImageMagick-7.1.2-3/coders/null.c b/ImageMagick-7.1.2-4/coders/null.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/null.c
rename to ImageMagick-7.1.2-4/coders/null.c
diff --git a/ImageMagick-7.1.2-3/coders/null.h b/ImageMagick-7.1.2-4/coders/null.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/null.h
rename to ImageMagick-7.1.2-4/coders/null.h
diff --git a/ImageMagick-7.1.2-3/coders/ora.c b/ImageMagick-7.1.2-4/coders/ora.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ora.c
rename to ImageMagick-7.1.2-4/coders/ora.c
diff --git a/ImageMagick-7.1.2-3/coders/ora.h b/ImageMagick-7.1.2-4/coders/ora.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ora.h
rename to ImageMagick-7.1.2-4/coders/ora.h
diff --git a/ImageMagick-7.1.2-3/coders/otb.c b/ImageMagick-7.1.2-4/coders/otb.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/otb.c
rename to ImageMagick-7.1.2-4/coders/otb.c
diff --git a/ImageMagick-7.1.2-3/coders/otb.h b/ImageMagick-7.1.2-4/coders/otb.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/otb.h
rename to ImageMagick-7.1.2-4/coders/otb.h
diff --git a/ImageMagick-7.1.2-3/coders/palm.c b/ImageMagick-7.1.2-4/coders/palm.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/palm.c
rename to ImageMagick-7.1.2-4/coders/palm.c
diff --git a/ImageMagick-7.1.2-3/coders/palm.h b/ImageMagick-7.1.2-4/coders/palm.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/palm.h
rename to ImageMagick-7.1.2-4/coders/palm.h
diff --git a/ImageMagick-7.1.2-3/coders/pango.c b/ImageMagick-7.1.2-4/coders/pango.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pango.c
rename to ImageMagick-7.1.2-4/coders/pango.c
diff --git a/ImageMagick-7.1.2-3/coders/pango.h b/ImageMagick-7.1.2-4/coders/pango.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pango.h
rename to ImageMagick-7.1.2-4/coders/pango.h
diff --git a/ImageMagick-7.1.2-3/coders/pattern.c b/ImageMagick-7.1.2-4/coders/pattern.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pattern.c
rename to ImageMagick-7.1.2-4/coders/pattern.c
diff --git a/ImageMagick-7.1.2-3/coders/pattern.h b/ImageMagick-7.1.2-4/coders/pattern.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pattern.h
rename to ImageMagick-7.1.2-4/coders/pattern.h
diff --git a/ImageMagick-7.1.2-3/coders/pcd.c b/ImageMagick-7.1.2-4/coders/pcd.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcd.c
rename to ImageMagick-7.1.2-4/coders/pcd.c
diff --git a/ImageMagick-7.1.2-3/coders/pcd.h b/ImageMagick-7.1.2-4/coders/pcd.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcd.h
rename to ImageMagick-7.1.2-4/coders/pcd.h
diff --git a/ImageMagick-7.1.2-3/coders/pcl.c b/ImageMagick-7.1.2-4/coders/pcl.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcl.c
rename to ImageMagick-7.1.2-4/coders/pcl.c
diff --git a/ImageMagick-7.1.2-3/coders/pcl.h b/ImageMagick-7.1.2-4/coders/pcl.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcl.h
rename to ImageMagick-7.1.2-4/coders/pcl.h
diff --git a/ImageMagick-7.1.2-3/coders/pcx.c b/ImageMagick-7.1.2-4/coders/pcx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcx.c
rename to ImageMagick-7.1.2-4/coders/pcx.c
diff --git a/ImageMagick-7.1.2-3/coders/pcx.h b/ImageMagick-7.1.2-4/coders/pcx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pcx.h
rename to ImageMagick-7.1.2-4/coders/pcx.h
diff --git a/ImageMagick-7.1.2-3/coders/pdb.c b/ImageMagick-7.1.2-4/coders/pdb.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pdb.c
rename to ImageMagick-7.1.2-4/coders/pdb.c
diff --git a/ImageMagick-7.1.2-3/coders/pdb.h b/ImageMagick-7.1.2-4/coders/pdb.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pdb.h
rename to ImageMagick-7.1.2-4/coders/pdb.h
diff --git a/ImageMagick-7.1.2-3/coders/pdf.c b/ImageMagick-7.1.2-4/coders/pdf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pdf.c
rename to ImageMagick-7.1.2-4/coders/pdf.c
diff --git a/ImageMagick-7.1.2-3/coders/pdf.h b/ImageMagick-7.1.2-4/coders/pdf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pdf.h
rename to ImageMagick-7.1.2-4/coders/pdf.h
diff --git a/ImageMagick-7.1.2-3/coders/pes.c b/ImageMagick-7.1.2-4/coders/pes.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pes.c
rename to ImageMagick-7.1.2-4/coders/pes.c
diff --git a/ImageMagick-7.1.2-3/coders/pes.h b/ImageMagick-7.1.2-4/coders/pes.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pes.h
rename to ImageMagick-7.1.2-4/coders/pes.h
diff --git a/ImageMagick-7.1.2-3/coders/pgx.c b/ImageMagick-7.1.2-4/coders/pgx.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pgx.c
rename to ImageMagick-7.1.2-4/coders/pgx.c
diff --git a/ImageMagick-7.1.2-3/coders/pgx.h b/ImageMagick-7.1.2-4/coders/pgx.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pgx.h
rename to ImageMagick-7.1.2-4/coders/pgx.h
diff --git a/ImageMagick-7.1.2-3/coders/pict.c b/ImageMagick-7.1.2-4/coders/pict.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pict.c
rename to ImageMagick-7.1.2-4/coders/pict.c
diff --git a/ImageMagick-7.1.2-3/coders/pict.h b/ImageMagick-7.1.2-4/coders/pict.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pict.h
rename to ImageMagick-7.1.2-4/coders/pict.h
diff --git a/ImageMagick-7.1.2-3/coders/pix.c b/ImageMagick-7.1.2-4/coders/pix.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pix.c
rename to ImageMagick-7.1.2-4/coders/pix.c
diff --git a/ImageMagick-7.1.2-3/coders/pix.h b/ImageMagick-7.1.2-4/coders/pix.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pix.h
rename to ImageMagick-7.1.2-4/coders/pix.h
diff --git a/ImageMagick-7.1.2-3/coders/plasma.c b/ImageMagick-7.1.2-4/coders/plasma.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/plasma.c
rename to ImageMagick-7.1.2-4/coders/plasma.c
diff --git a/ImageMagick-7.1.2-3/coders/plasma.h b/ImageMagick-7.1.2-4/coders/plasma.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/plasma.h
rename to ImageMagick-7.1.2-4/coders/plasma.h
diff --git a/ImageMagick-7.1.2-3/coders/png.c b/ImageMagick-7.1.2-4/coders/png.c
similarity index 99%
rename from ImageMagick-7.1.2-3/coders/png.c
rename to ImageMagick-7.1.2-4/coders/png.c
index b32dd14b3..76c3e5ca8 100644
--- a/ImageMagick-7.1.2-3/coders/png.c
+++ b/ImageMagick-7.1.2-4/coders/png.c
@@ -7692,7 +7692,7 @@ Magick_png_write_raw_profile(const ImageInfo *image_info,png_struct *ping,
        { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' },
      *sp;
 
-   if (length > 1)
+   if (length > 10)
      {
        if (LocaleNCompare((char *) profile_type+1, "ng-chunk-",9) == 0)
           return;
diff --git a/ImageMagick-7.1.2-3/coders/png.h b/ImageMagick-7.1.2-4/coders/png.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/png.h
rename to ImageMagick-7.1.2-4/coders/png.h
diff --git a/ImageMagick-7.1.2-3/coders/pnm.c b/ImageMagick-7.1.2-4/coders/pnm.c
similarity index 99%
rename from ImageMagick-7.1.2-3/coders/pnm.c
rename to ImageMagick-7.1.2-4/coders/pnm.c
index 24fce894f..9231c5bc7 100644
--- a/ImageMagick-7.1.2-3/coders/pnm.c
+++ b/ImageMagick-7.1.2-4/coders/pnm.c
@@ -1784,6 +1784,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
     *value;
 
   MagickBooleanType
+    added_newline,
     status;
 
   MagickOffsetType
@@ -2015,6 +2016,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
         (void) SetImageType(image,BilevelType,exception);
         extent=1;
         q=pixels;
+        added_newline=MagickFalse;
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           const Quantum
@@ -2037,12 +2039,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
                     *q++='\n';
                     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
                     q=pixels;
+                    added_newline=MagickTrue;
                   }
               }
             *q++=(unsigned char) (GetPixelLuma(image,p) >= ((double)
               QuantumRange/2.0) ? '0' : '1');
             p+=(ptrdiff_t) GetPixelChannels(image);
           }
+          if (added_newline == MagickFalse)
+            {
+              *q++='\n';
+              (void) WriteBlob(image,(size_t) (q-pixels),pixels);
+              q=pixels;
+            }
           if (image->previous == (Image *) NULL)
             {
               status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2074,6 +2083,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
           else
             (void) WriteBlobString(image,"4294967295\n");
         q=pixels;
+        added_newline=MagickFalse;
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           const Quantum
@@ -2108,12 +2118,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
                     *q++='\n';
                     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
                     q=pixels;
+                    added_newline=MagickTrue;
                   }
               }
             (void) memcpy((char *) q,buffer,extent);
             q+=(ptrdiff_t) extent;
             p+=(ptrdiff_t) GetPixelChannels(image);
           }
+          if (added_newline == MagickFalse)
+            {
+              *q++='\n';
+              (void) WriteBlob(image,(size_t) (q-pixels),pixels);
+              q=pixels;
+            }
           if (image->previous == (Image *) NULL)
             {
               status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2147,6 +2164,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
           else
             (void) WriteBlobString(image,"4294967295\n");
         q=pixels;
+        added_newline=MagickFalse;
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           const Quantum
@@ -2186,12 +2204,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
                     *q++='\n';
                     (void) WriteBlob(image,(size_t) (q-pixels),pixels);
                     q=pixels;
+                    added_newline=MagickTrue;
                   }
               }
             (void) memcpy((char *) q,buffer,extent);
             q+=(ptrdiff_t) extent;
             p+=(ptrdiff_t) GetPixelChannels(image);
           }
+          if (added_newline == MagickFalse)
+            {
+              *q++='\n';
+              (void) WriteBlob(image,(size_t) (q-pixels),pixels);
+              q=pixels;
+            }
           if (image->previous == (Image *) NULL)
             {
               status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/ImageMagick-7.1.2-3/coders/pnm.h b/ImageMagick-7.1.2-4/coders/pnm.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pnm.h
rename to ImageMagick-7.1.2-4/coders/pnm.h
diff --git a/ImageMagick-7.1.2-3/coders/ps.c b/ImageMagick-7.1.2-4/coders/ps.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps.c
rename to ImageMagick-7.1.2-4/coders/ps.c
diff --git a/ImageMagick-7.1.2-3/coders/ps.h b/ImageMagick-7.1.2-4/coders/ps.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps.h
rename to ImageMagick-7.1.2-4/coders/ps.h
diff --git a/ImageMagick-7.1.2-3/coders/ps2.c b/ImageMagick-7.1.2-4/coders/ps2.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps2.c
rename to ImageMagick-7.1.2-4/coders/ps2.c
diff --git a/ImageMagick-7.1.2-3/coders/ps2.h b/ImageMagick-7.1.2-4/coders/ps2.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps2.h
rename to ImageMagick-7.1.2-4/coders/ps2.h
diff --git a/ImageMagick-7.1.2-3/coders/ps3.c b/ImageMagick-7.1.2-4/coders/ps3.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps3.c
rename to ImageMagick-7.1.2-4/coders/ps3.c
diff --git a/ImageMagick-7.1.2-3/coders/ps3.h b/ImageMagick-7.1.2-4/coders/ps3.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ps3.h
rename to ImageMagick-7.1.2-4/coders/ps3.h
diff --git a/ImageMagick-7.1.2-3/coders/psd-private.h b/ImageMagick-7.1.2-4/coders/psd-private.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/psd-private.h
rename to ImageMagick-7.1.2-4/coders/psd-private.h
diff --git a/ImageMagick-7.1.2-3/coders/psd.c b/ImageMagick-7.1.2-4/coders/psd.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/psd.c
rename to ImageMagick-7.1.2-4/coders/psd.c
diff --git a/ImageMagick-7.1.2-3/coders/psd.h b/ImageMagick-7.1.2-4/coders/psd.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/psd.h
rename to ImageMagick-7.1.2-4/coders/psd.h
diff --git a/ImageMagick-7.1.2-3/coders/pwp.c b/ImageMagick-7.1.2-4/coders/pwp.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pwp.c
rename to ImageMagick-7.1.2-4/coders/pwp.c
diff --git a/ImageMagick-7.1.2-3/coders/pwp.h b/ImageMagick-7.1.2-4/coders/pwp.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/pwp.h
rename to ImageMagick-7.1.2-4/coders/pwp.h
diff --git a/ImageMagick-7.1.2-3/coders/qoi.c b/ImageMagick-7.1.2-4/coders/qoi.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/qoi.c
rename to ImageMagick-7.1.2-4/coders/qoi.c
diff --git a/ImageMagick-7.1.2-3/coders/qoi.h b/ImageMagick-7.1.2-4/coders/qoi.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/qoi.h
rename to ImageMagick-7.1.2-4/coders/qoi.h
diff --git a/ImageMagick-7.1.2-3/coders/raw.c b/ImageMagick-7.1.2-4/coders/raw.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/raw.c
rename to ImageMagick-7.1.2-4/coders/raw.c
diff --git a/ImageMagick-7.1.2-3/coders/raw.h b/ImageMagick-7.1.2-4/coders/raw.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/raw.h
rename to ImageMagick-7.1.2-4/coders/raw.h
diff --git a/ImageMagick-7.1.2-3/coders/rgb.c b/ImageMagick-7.1.2-4/coders/rgb.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rgb.c
rename to ImageMagick-7.1.2-4/coders/rgb.c
diff --git a/ImageMagick-7.1.2-3/coders/rgb.h b/ImageMagick-7.1.2-4/coders/rgb.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rgb.h
rename to ImageMagick-7.1.2-4/coders/rgb.h
diff --git a/ImageMagick-7.1.2-3/coders/rgf.c b/ImageMagick-7.1.2-4/coders/rgf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rgf.c
rename to ImageMagick-7.1.2-4/coders/rgf.c
diff --git a/ImageMagick-7.1.2-3/coders/rgf.h b/ImageMagick-7.1.2-4/coders/rgf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rgf.h
rename to ImageMagick-7.1.2-4/coders/rgf.h
diff --git a/ImageMagick-7.1.2-3/coders/rla.c b/ImageMagick-7.1.2-4/coders/rla.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rla.c
rename to ImageMagick-7.1.2-4/coders/rla.c
diff --git a/ImageMagick-7.1.2-3/coders/rla.h b/ImageMagick-7.1.2-4/coders/rla.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rla.h
rename to ImageMagick-7.1.2-4/coders/rla.h
diff --git a/ImageMagick-7.1.2-3/coders/rle.c b/ImageMagick-7.1.2-4/coders/rle.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rle.c
rename to ImageMagick-7.1.2-4/coders/rle.c
diff --git a/ImageMagick-7.1.2-3/coders/rle.h b/ImageMagick-7.1.2-4/coders/rle.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/rle.h
rename to ImageMagick-7.1.2-4/coders/rle.h
diff --git a/ImageMagick-7.1.2-3/coders/scr.c b/ImageMagick-7.1.2-4/coders/scr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/scr.c
rename to ImageMagick-7.1.2-4/coders/scr.c
diff --git a/ImageMagick-7.1.2-3/coders/scr.h b/ImageMagick-7.1.2-4/coders/scr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/scr.h
rename to ImageMagick-7.1.2-4/coders/scr.h
diff --git a/ImageMagick-7.1.2-3/coders/screenshot.c b/ImageMagick-7.1.2-4/coders/screenshot.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/screenshot.c
rename to ImageMagick-7.1.2-4/coders/screenshot.c
diff --git a/ImageMagick-7.1.2-3/coders/screenshot.h b/ImageMagick-7.1.2-4/coders/screenshot.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/screenshot.h
rename to ImageMagick-7.1.2-4/coders/screenshot.h
diff --git a/ImageMagick-7.1.2-3/coders/sct.c b/ImageMagick-7.1.2-4/coders/sct.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sct.c
rename to ImageMagick-7.1.2-4/coders/sct.c
diff --git a/ImageMagick-7.1.2-3/coders/sct.h b/ImageMagick-7.1.2-4/coders/sct.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sct.h
rename to ImageMagick-7.1.2-4/coders/sct.h
diff --git a/ImageMagick-7.1.2-3/coders/sf3.c b/ImageMagick-7.1.2-4/coders/sf3.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sf3.c
rename to ImageMagick-7.1.2-4/coders/sf3.c
diff --git a/ImageMagick-7.1.2-3/coders/sf3.h b/ImageMagick-7.1.2-4/coders/sf3.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sf3.h
rename to ImageMagick-7.1.2-4/coders/sf3.h
diff --git a/ImageMagick-7.1.2-3/coders/sfw.c b/ImageMagick-7.1.2-4/coders/sfw.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sfw.c
rename to ImageMagick-7.1.2-4/coders/sfw.c
diff --git a/ImageMagick-7.1.2-3/coders/sfw.h b/ImageMagick-7.1.2-4/coders/sfw.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sfw.h
rename to ImageMagick-7.1.2-4/coders/sfw.h
diff --git a/ImageMagick-7.1.2-3/coders/sgi.c b/ImageMagick-7.1.2-4/coders/sgi.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sgi.c
rename to ImageMagick-7.1.2-4/coders/sgi.c
diff --git a/ImageMagick-7.1.2-3/coders/sgi.h b/ImageMagick-7.1.2-4/coders/sgi.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sgi.h
rename to ImageMagick-7.1.2-4/coders/sgi.h
diff --git a/ImageMagick-7.1.2-3/coders/sixel.c b/ImageMagick-7.1.2-4/coders/sixel.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sixel.c
rename to ImageMagick-7.1.2-4/coders/sixel.c
diff --git a/ImageMagick-7.1.2-3/coders/sixel.h b/ImageMagick-7.1.2-4/coders/sixel.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sixel.h
rename to ImageMagick-7.1.2-4/coders/sixel.h
diff --git a/ImageMagick-7.1.2-3/coders/stegano.c b/ImageMagick-7.1.2-4/coders/stegano.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/stegano.c
rename to ImageMagick-7.1.2-4/coders/stegano.c
diff --git a/ImageMagick-7.1.2-3/coders/stegano.h b/ImageMagick-7.1.2-4/coders/stegano.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/stegano.h
rename to ImageMagick-7.1.2-4/coders/stegano.h
diff --git a/ImageMagick-7.1.2-3/coders/strimg.c b/ImageMagick-7.1.2-4/coders/strimg.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/strimg.c
rename to ImageMagick-7.1.2-4/coders/strimg.c
diff --git a/ImageMagick-7.1.2-3/coders/strimg.h b/ImageMagick-7.1.2-4/coders/strimg.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/strimg.h
rename to ImageMagick-7.1.2-4/coders/strimg.h
diff --git a/ImageMagick-7.1.2-3/coders/sun.c b/ImageMagick-7.1.2-4/coders/sun.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sun.c
rename to ImageMagick-7.1.2-4/coders/sun.c
diff --git a/ImageMagick-7.1.2-3/coders/sun.h b/ImageMagick-7.1.2-4/coders/sun.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/sun.h
rename to ImageMagick-7.1.2-4/coders/sun.h
diff --git a/ImageMagick-7.1.2-3/coders/svg.c b/ImageMagick-7.1.2-4/coders/svg.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/svg.c
rename to ImageMagick-7.1.2-4/coders/svg.c
diff --git a/ImageMagick-7.1.2-3/coders/svg.h b/ImageMagick-7.1.2-4/coders/svg.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/svg.h
rename to ImageMagick-7.1.2-4/coders/svg.h
diff --git a/ImageMagick-7.1.2-3/coders/tga.c b/ImageMagick-7.1.2-4/coders/tga.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tga.c
rename to ImageMagick-7.1.2-4/coders/tga.c
diff --git a/ImageMagick-7.1.2-3/coders/tga.h b/ImageMagick-7.1.2-4/coders/tga.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tga.h
rename to ImageMagick-7.1.2-4/coders/tga.h
diff --git a/ImageMagick-7.1.2-3/coders/thumbnail.c b/ImageMagick-7.1.2-4/coders/thumbnail.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/thumbnail.c
rename to ImageMagick-7.1.2-4/coders/thumbnail.c
diff --git a/ImageMagick-7.1.2-3/coders/thumbnail.h b/ImageMagick-7.1.2-4/coders/thumbnail.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/thumbnail.h
rename to ImageMagick-7.1.2-4/coders/thumbnail.h
diff --git a/ImageMagick-7.1.2-3/coders/tiff.c b/ImageMagick-7.1.2-4/coders/tiff.c
similarity index 95%
rename from ImageMagick-7.1.2-3/coders/tiff.c
rename to ImageMagick-7.1.2-4/coders/tiff.c
index a5b8b60f3..d23998251 100644
--- a/ImageMagick-7.1.2-3/coders/tiff.c
+++ b/ImageMagick-7.1.2-4/coders/tiff.c
@@ -1201,7 +1201,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     *quantum_info;
 
   QuantumType
-    quantum_type;
+    image_quantum_type;
 
   ssize_t
     i,
@@ -1311,6 +1311,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     /* TIFFPrintDirectory(tiff,stdout,MagickFalse); */
     if ((TIFFGetField(tiff,TIFFTAG_IMAGEWIDTH,&width) != 1) ||
         (TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&height) != 1) ||
+        (TIFFGetFieldDefaulted(tiff,TIFFTAG_PHOTOMETRIC,&photometric,sans) != 1) ||
         (TIFFGetFieldDefaulted(tiff,TIFFTAG_COMPRESSION,&compress_tag,sans) != 1) ||
         (TIFFGetFieldDefaulted(tiff,TIFFTAG_FILLORDER,&endian,sans) != 1) ||
         (TIFFGetFieldDefaulted(tiff,TIFFTAG_PLANARCONFIG,&interlace,sans) != 1) ||
@@ -1771,12 +1772,12 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
     pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info);
     (void) memset(pixels,0,(size_t) number_pixels*sizeof(uint32));
-    quantum_type=GrayQuantum;
+    image_quantum_type=GrayQuantum;
     if (image->storage_class == PseudoClass)
-      quantum_type=IndexQuantum;
+      image_quantum_type=IndexQuantum;
     if (image->number_meta_channels != 0)
       {
-        quantum_type=MultispectralQuantum;
+        image_quantum_type=MultispectralQuantum;
         (void) SetQuantumPad(image,quantum_info,0);
       }
     else
@@ -1791,21 +1792,21 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               if (image->colorspace == CMYKColorspace)
                 {
                   pad-=4;
-                  quantum_type=CMYKQuantum;
+                  image_quantum_type=CMYKQuantum;
                   if (image->alpha_trait != UndefinedPixelTrait)
                     {
                       pad--;
-                      quantum_type=CMYKAQuantum;
+                      image_quantum_type=CMYKAQuantum;
                     }
                 }
               else
                 {
                   pad-=3;
-                  quantum_type=RGBQuantum;
+                  image_quantum_type=RGBQuantum;
                   if (image->alpha_trait != UndefinedPixelTrait)
                     {
                       pad--;
-                      quantum_type=RGBAQuantum;
+                      image_quantum_type=RGBAQuantum;
                     }
                 }
             }
@@ -1815,14 +1816,14 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
               if (image->alpha_trait != UndefinedPixelTrait)
                 {
                   if (samples_per_pixel == 1)
-                    quantum_type=AlphaQuantum;
+                    image_quantum_type=AlphaQuantum;
                   else
                     {
                       pad--;
                       if (image->storage_class == PseudoClass)
-                        quantum_type=IndexAlphaQuantum;
+                        image_quantum_type=IndexAlphaQuantum;
                       else
-                        quantum_type=GrayAlphaQuantum;
+                        image_quantum_type=GrayAlphaQuantum;
                     }
                 }
             }
@@ -1909,7 +1910,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           */
           strip_size=TIFFStripSize(tiff);
           stride=(ssize_t) TIFFVStripSize(tiff,1);
-          length=GetQuantumExtent(image,quantum_info,quantum_type);
+          length=GetQuantumExtent(image,quantum_info,image_quantum_type);
           extent=(size_t) MagickMax((size_t) strip_size,rows_per_strip*
             MagickMax((size_t) stride,length));
           strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
@@ -1921,6 +1922,9 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           p=strip_pixels;
           for (i=0; i < (ssize_t) samples_per_pixel; i++)
           {
+            QuantumType
+              quantum_type = image_quantum_type;
+
             size_t
               rows_remaining;
 
@@ -1929,7 +1933,12 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
 
             switch (i)
             {
-              case 0: break;
+              case 0:
+              {
+                if (interlace == PLANARCONFIG_SEPARATE)
+                  quantum_type=RedQuantum;
+                break;
+              }
               case 1: quantum_type=GreenQuantum; break;
               case 2: quantum_type=BlueQuantum; break;
               case 3:
@@ -1939,9 +1948,26 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                   quantum_type=BlackQuantum;
                 break;
               }
-              case 4: quantum_type=AlphaQuantum; break;
+              case 4:
+              {
+                if (image->colorspace == CMYKColorspace)
+                  {
+                    quantum_type=AlphaQuantum;
+                    break;
+                  }
+                magick_fallthrough;
+              }
               default:
+              {
+                if (quantum_type == MultispectralQuantum)
+                  {
+                    if (image->colorspace == CMYKColorspace)
+                      (void) SetQuantumMetaChannel(image,quantum_info,i-5);
+                    else
+                      (void) SetQuantumMetaChannel(image,quantum_info,i-4);
+                  }
                 break;
+              }
             }
             rows_remaining=0;
             for (y=0; y < (ssize_t) image->rows; y++)
@@ -1980,6 +2006,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                 (interlace != PLANARCONFIG_SEPARATE)))
               break;
           }
+          (void) SetQuantumMetaChannel(image,quantum_info,-1);
           strip_pixels=(unsigned char *) RelinquishMagickMemory(strip_pixels);
           break;
         }
@@ -2016,7 +2043,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
           tile_size=TIFFTileSize(tiff);
           stride=(ssize_t) TIFFTileRowSize(tiff);
-          length=GetQuantumExtent(image,quantum_info,quantum_type);
+          length=GetQuantumExtent(image,quantum_info,image_quantum_type);
           extent=(size_t) MagickMax((size_t) tile_size,rows*
             MagickMax((size_t) stride,length));
           tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
@@ -2026,12 +2053,20 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           (void) memset(tile_pixels,0,extent*sizeof(*tile_pixels));
           for (i=0; i < (ssize_t) samples_per_pixel; i++)
           {
+            QuantumType
+              quantum_type = image_quantum_type;
+
             tmsize_t
               size = 0;
 
             switch (i)
             {
-              case 0: break;
+              case 0:
+              {
+                if (interlace == PLANARCONFIG_SEPARATE)
+                  quantum_type=RedQuantum;
+                break;
+              }
               case 1: quantum_type=GreenQuantum; break;
               case 2: quantum_type=BlueQuantum; break;
               case 3:
@@ -2041,8 +2076,26 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                   quantum_type=BlackQuantum;
                 break;
               }
-              case 4: quantum_type=AlphaQuantum; break;
-              default: break;
+              case 4:
+              {
+                if (image->colorspace == CMYKColorspace)
+                  {
+                    quantum_type=AlphaQuantum;
+                    break;
+                  }
+                magick_fallthrough;
+              }
+              default:
+              {
+                if (quantum_type == MultispectralQuantum)
+                  {
+                    if (image->colorspace == CMYKColorspace)
+                      (void) SetQuantumMetaChannel(image,quantum_info,i-5);
+                    else
+                      (void) SetQuantumMetaChannel(image,quantum_info,i-4);
+                  }
+                break;
+              }
             }
             for (y=0; y < (ssize_t) image->rows; y+=rows)
             {
@@ -2099,6 +2152,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                   break;
               }
           }
+          (void) SetQuantumMetaChannel(image,quantum_info,-1);
           tile_pixels=(unsigned char *) RelinquishMagickMemory(tile_pixels);
           break;
         }
@@ -2171,7 +2225,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         }
       }
     pixel_info=RelinquishVirtualMemory(pixel_info);
-    SetQuantumImageType(image,quantum_type);
+    SetQuantumImageType(image,image_quantum_type);
   next_tiff_frame:
     if (quantum_info != (QuantumInfo *) NULL)
       quantum_info=DestroyQuantumInfo(quantum_info);
@@ -3389,6 +3443,29 @@ static void TIFFSetProperties(TIFF *tiff,const MagickBooleanType adjoin,
     }
 }
 
+static MagickBooleanType WriteTIFFChannels(Image *image,TIFF *tiff,
+  TIFFInfo tiff_info,QuantumInfo *quantum_info,QuantumType quantum_type,
+  tsample_t sample,unsigned char *pixels,ExceptionInfo *exception)
+{
+  ssize_t
+    y;
+
+  for (y=0; y < (ssize_t) image->rows; y++)
+  {
+    const Quantum
+      *magick_restrict p;
+
+    p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+    if (p == (const Quantum *) NULL)
+      break;
+    (void) ExportQuantumPixels(image,(CacheView*)NULL,quantum_info,
+      quantum_type,pixels,exception);
+    if (TIFFWritePixels(tiff,&tiff_info,y,sample,image) == -1)
+      return(MagickFalse);
+  }
+  return(MagickTrue);
+}
+
 static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
   Image *image,ExceptionInfo *exception)
 {
@@ -3402,9 +3479,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
   EndianType
     endian_type;
 
-  int
-    tiff_status = 0;
-
   MagickBooleanType
     adjoin,
     preserve_compression,
@@ -3421,12 +3495,10 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
 
   size_t
     extra_samples,
-    length,
     number_scenes;
 
   ssize_t
-    i,
-    y;
+    i;
 
   TIFF
     *tiff;
@@ -3787,10 +3859,10 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         break;
     }
     (void) TIFFSetField(tiff,TIFFTAG_PLANARCONFIG,PLANARCONFIG_CONTIG);
-    if (photometric == PHOTOMETRIC_RGB)
-      if ((image_info->interlace == PlaneInterlace) ||
-          (image_info->interlace == PartitionInterlace))
-        (void) TIFFSetField(tiff,TIFFTAG_PLANARCONFIG,PLANARCONFIG_SEPARATE);
+    if ((photometric == PHOTOMETRIC_RGB) &&
+        ((image_info->interlace == PlaneInterlace) ||
+         (image_info->interlace == PartitionInterlace)))
+      (void) TIFFSetField(tiff,TIFFTAG_PLANARCONFIG,PLANARCONFIG_SEPARATE);
     predictor=0;
     switch (compress_tag)
     {
@@ -4071,117 +4143,47 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
                 quantum_type=MultispectralQuantum;
                 (void) SetQuantumPad(image,quantum_info,0);
               }
-            for (y=0; y < (ssize_t) image->rows; y++)
-            {
-              const Quantum
-                *magick_restrict p;
-
-              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);
-              (void) length;
-              tiff_status=TIFFWritePixels(tiff,&tiff_info,y,0,image);
-              if (tiff_status == -1)
-                break;
-              if (image->previous == (Image *) NULL)
-                {
-                  status=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
-                    y,image->rows);
-                  if (status == MagickFalse)
-                    break;
-                }
-            }
+            status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+              quantum_type,0,pixels,exception);
             break;
           }
           case PlaneInterlace:
           case PartitionInterlace:
           {
+            tsample_t
+              sample = 0;
+
             /*
               Plane interlacing:  RRRRRR...GGGGGG...BBBBBB...
             */
-            for (y=0; y < (ssize_t) image->rows; y++)
-            {
-              const Quantum
-                *magick_restrict p;
-
-              p=GetVirtualPixels(image,0,y,image->columns,1,exception);
-              if (p == (const Quantum *) NULL)
-                break;
-              length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
-                RedQuantum,pixels,exception);
-              tiff_status=TIFFWritePixels(tiff,&tiff_info,y,0,image);
-              if (tiff_status == -1)
-                break;
-            }
-            if (image->previous == (Image *) NULL)
-              {
-                status=SetImageProgress(image,SaveImageTag,100,400);
-                if (status == MagickFalse)
-                  break;
-              }
-            for (y=0; y < (ssize_t) image->rows; y++)
-            {
-              const Quantum
-                *magick_restrict p;
-
-              p=GetVirtualPixels(image,0,y,image->columns,1,exception);
-              if (p == (const Quantum *) NULL)
-                break;
-              length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
-                GreenQuantum,pixels,exception);
-              tiff_status=TIFFWritePixels(tiff,&tiff_info,y,1,image);
-              if (tiff_status == -1)
-                break;
-            }
-            if (image->previous == (Image *) NULL)
+            status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+              RedQuantum,sample++,pixels,exception);
+            if (status == MagickFalse)
+              break;
+            status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+              GreenQuantum,sample++,pixels,exception);
+            if (status == MagickFalse)
+              break;
+            status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+              BlueQuantum,sample++,pixels,exception);
+            if (status == MagickFalse)
+              break;
+            if (image->alpha_trait != UndefinedPixelTrait)
               {
-                status=SetImageProgress(image,SaveImageTag,200,400);
+                status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+                  AlphaQuantum,sample++,pixels,exception);
                 if (status == MagickFalse)
                   break;
               }
-            for (y=0; y < (ssize_t) image->rows; y++)
+            for (i=0; i < (ssize_t) image->number_meta_channels; i++)
             {
-              const Quantum
-                *magick_restrict p;
-
-              p=GetVirtualPixels(image,0,y,image->columns,1,exception);
-              if (p == (const Quantum *) NULL)
-                break;
-              length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
-                BlueQuantum,pixels,exception);
-              tiff_status=TIFFWritePixels(tiff,&tiff_info,y,2,image);
-              if (tiff_status == -1)
+              (void) SetQuantumMetaChannel(image,quantum_info,i);
+              status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+                MultispectralQuantum,sample++,pixels,exception);
+              if (status == MagickFalse)
                 break;
             }
-            if (image->previous == (Image *) NULL)
-              {
-                status=SetImageProgress(image,SaveImageTag,300,400);
-                if (status == MagickFalse)
-                  break;
-              }
-            if (image->alpha_trait != UndefinedPixelTrait)
-              for (y=0; y < (ssize_t) image->rows; y++)
-              {
-                const Quantum
-                  *magick_restrict p;
-
-                p=GetVirtualPixels(image,0,y,image->columns,1,exception);
-                if (p == (const Quantum *) NULL)
-                  break;
-                length=ExportQuantumPixels(image,(CacheView *) NULL,
-                  quantum_info,AlphaQuantum,pixels,exception);
-                tiff_status=TIFFWritePixels(tiff,&tiff_info,y,3,image);
-                if (tiff_status == -1)
-                  break;
-              }
-            if (image->previous == (Image *) NULL)
-              {
-                status=SetImageProgress(image,SaveImageTag,400,400);
-                if (status == MagickFalse)
-                  break;
-              }
+            (void) SetQuantumMetaChannel(image,quantum_info,-1);
             break;
           }
         }
@@ -4202,27 +4204,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
           }
         if (image->colorspace != CMYKColorspace)
           (void) TransformImageColorspace(image,CMYKColorspace,exception);
-        for (y=0; y < (ssize_t) image->rows; y++)
-        {
-          const Quantum
-            *magick_restrict p;
-
-          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);
-          tiff_status=TIFFWritePixels(tiff,&tiff_info,y,0,image);
-          if (tiff_status == -1)
-            break;
-          if (image->previous == (Image *) NULL)
-            {
-              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
-              if (status == MagickFalse)
-                break;
-            }
-        }
+        status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+          quantum_type,0,pixels,exception);
         break;
       }
       case PHOTOMETRIC_PALETTE:
@@ -4285,27 +4268,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
              quantum_type=GrayQuantum;
         if (image->number_meta_channels != 0)
           quantum_type=MultispectralQuantum;
-        for (y=0; y < (ssize_t) image->rows; y++)
-        {
-          const Quantum
-            *magick_restrict p;
-
-          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);
-          tiff_status=TIFFWritePixels(tiff,&tiff_info,y,0,image);
-          if (tiff_status == -1)
-            break;
-          if (image->previous == (Image *) NULL)
-            {
-              status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
-              if (status == MagickFalse)
-                break;
-            }
-        }
+        status=WriteTIFFChannels(image,tiff,tiff_info,quantum_info,
+          quantum_type,0,pixels,exception);
         break;
       }
     }
@@ -4314,11 +4278,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
       DecodeLabImage(image,exception);
     DestroyTIFFInfo(&tiff_info);
     /* TIFFPrintDirectory(tiff,stdout,MagickFalse); */
-    if (tiff_status == -1)
-      {
-        status=MagickFalse;
-        break;
-      }
+    if (status == MagickFalse)
+      break;
     if (TIFFWriteDirectory(tiff) == 0)
       {
         status=MagickFalse;
diff --git a/ImageMagick-7.1.2-3/coders/tiff.h b/ImageMagick-7.1.2-4/coders/tiff.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tiff.h
rename to ImageMagick-7.1.2-4/coders/tiff.h
diff --git a/ImageMagick-7.1.2-3/coders/tile.c b/ImageMagick-7.1.2-4/coders/tile.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tile.c
rename to ImageMagick-7.1.2-4/coders/tile.c
diff --git a/ImageMagick-7.1.2-3/coders/tile.h b/ImageMagick-7.1.2-4/coders/tile.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tile.h
rename to ImageMagick-7.1.2-4/coders/tile.h
diff --git a/ImageMagick-7.1.2-3/coders/tim.c b/ImageMagick-7.1.2-4/coders/tim.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tim.c
rename to ImageMagick-7.1.2-4/coders/tim.c
diff --git a/ImageMagick-7.1.2-3/coders/tim.h b/ImageMagick-7.1.2-4/coders/tim.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tim.h
rename to ImageMagick-7.1.2-4/coders/tim.h
diff --git a/ImageMagick-7.1.2-3/coders/tim2.c b/ImageMagick-7.1.2-4/coders/tim2.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tim2.c
rename to ImageMagick-7.1.2-4/coders/tim2.c
diff --git a/ImageMagick-7.1.2-3/coders/tim2.h b/ImageMagick-7.1.2-4/coders/tim2.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/tim2.h
rename to ImageMagick-7.1.2-4/coders/tim2.h
diff --git a/ImageMagick-7.1.2-3/coders/ttf.c b/ImageMagick-7.1.2-4/coders/ttf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ttf.c
rename to ImageMagick-7.1.2-4/coders/ttf.c
diff --git a/ImageMagick-7.1.2-3/coders/ttf.h b/ImageMagick-7.1.2-4/coders/ttf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ttf.h
rename to ImageMagick-7.1.2-4/coders/ttf.h
diff --git a/ImageMagick-7.1.2-3/coders/txt.c b/ImageMagick-7.1.2-4/coders/txt.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/txt.c
rename to ImageMagick-7.1.2-4/coders/txt.c
diff --git a/ImageMagick-7.1.2-3/coders/txt.h b/ImageMagick-7.1.2-4/coders/txt.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/txt.h
rename to ImageMagick-7.1.2-4/coders/txt.h
diff --git a/ImageMagick-7.1.2-3/coders/uhdr.c b/ImageMagick-7.1.2-4/coders/uhdr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uhdr.c
rename to ImageMagick-7.1.2-4/coders/uhdr.c
diff --git a/ImageMagick-7.1.2-3/coders/uhdr.h b/ImageMagick-7.1.2-4/coders/uhdr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uhdr.h
rename to ImageMagick-7.1.2-4/coders/uhdr.h
diff --git a/ImageMagick-7.1.2-3/coders/uil.c b/ImageMagick-7.1.2-4/coders/uil.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uil.c
rename to ImageMagick-7.1.2-4/coders/uil.c
diff --git a/ImageMagick-7.1.2-3/coders/uil.h b/ImageMagick-7.1.2-4/coders/uil.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uil.h
rename to ImageMagick-7.1.2-4/coders/uil.h
diff --git a/ImageMagick-7.1.2-3/coders/url.c b/ImageMagick-7.1.2-4/coders/url.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/url.c
rename to ImageMagick-7.1.2-4/coders/url.c
diff --git a/ImageMagick-7.1.2-3/coders/url.h b/ImageMagick-7.1.2-4/coders/url.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/url.h
rename to ImageMagick-7.1.2-4/coders/url.h
diff --git a/ImageMagick-7.1.2-3/coders/uyvy.c b/ImageMagick-7.1.2-4/coders/uyvy.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uyvy.c
rename to ImageMagick-7.1.2-4/coders/uyvy.c
diff --git a/ImageMagick-7.1.2-3/coders/uyvy.h b/ImageMagick-7.1.2-4/coders/uyvy.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/uyvy.h
rename to ImageMagick-7.1.2-4/coders/uyvy.h
diff --git a/ImageMagick-7.1.2-3/coders/vicar.c b/ImageMagick-7.1.2-4/coders/vicar.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vicar.c
rename to ImageMagick-7.1.2-4/coders/vicar.c
diff --git a/ImageMagick-7.1.2-3/coders/vicar.h b/ImageMagick-7.1.2-4/coders/vicar.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vicar.h
rename to ImageMagick-7.1.2-4/coders/vicar.h
diff --git a/ImageMagick-7.1.2-3/coders/vid.c b/ImageMagick-7.1.2-4/coders/vid.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vid.c
rename to ImageMagick-7.1.2-4/coders/vid.c
diff --git a/ImageMagick-7.1.2-3/coders/vid.h b/ImageMagick-7.1.2-4/coders/vid.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vid.h
rename to ImageMagick-7.1.2-4/coders/vid.h
diff --git a/ImageMagick-7.1.2-3/coders/video.c b/ImageMagick-7.1.2-4/coders/video.c
similarity index 99%
rename from ImageMagick-7.1.2-3/coders/video.c
rename to ImageMagick-7.1.2-4/coders/video.c
index dc122fb5a..d7603317b 100644
--- a/ImageMagick-7.1.2-3/coders/video.c
+++ b/ImageMagick-7.1.2-4/coders/video.c
@@ -232,7 +232,7 @@ static Image *ReadVIDEOImage(const ImageInfo *image_info,
       if (option != (const char *) NULL)
         {
           FormatSanitizedDelegateOption(command,MagickPathExtent,
-            " -vsync \"%s\""," -vsync '%s'",option);
+            " -fps_mode \"%s\""," -fps_mode '%s'",option);
           (void) ConcatenateMagickString(options,command,MagickPathExtent);
         }
       option=GetImageOption(image_info,"video:pixel-format");
@@ -248,7 +248,7 @@ static Image *ReadVIDEOImage(const ImageInfo *image_info,
             MagickPathExtent);
       intermediate_format=GetIntermediateFormat(image_info);
       (void) FormatLocaleString(command,MagickPathExtent,
-        " -vcodec %s -lossless 1",intermediate_format);
+        " -vcodec %s",intermediate_format);
       (void) ConcatenateMagickString(options,command,MagickPathExtent);
       AcquireUniqueFilename(read_info->unique);
       (void) AcquireUniqueSymbolicLink(image_info->filename,
diff --git a/ImageMagick-7.1.2-3/coders/video.h b/ImageMagick-7.1.2-4/coders/video.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/video.h
rename to ImageMagick-7.1.2-4/coders/video.h
diff --git a/ImageMagick-7.1.2-3/coders/viff.c b/ImageMagick-7.1.2-4/coders/viff.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/viff.c
rename to ImageMagick-7.1.2-4/coders/viff.c
diff --git a/ImageMagick-7.1.2-3/coders/viff.h b/ImageMagick-7.1.2-4/coders/viff.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/viff.h
rename to ImageMagick-7.1.2-4/coders/viff.h
diff --git a/ImageMagick-7.1.2-3/coders/vips.c b/ImageMagick-7.1.2-4/coders/vips.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vips.c
rename to ImageMagick-7.1.2-4/coders/vips.c
diff --git a/ImageMagick-7.1.2-3/coders/vips.h b/ImageMagick-7.1.2-4/coders/vips.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/vips.h
rename to ImageMagick-7.1.2-4/coders/vips.h
diff --git a/ImageMagick-7.1.2-3/coders/wbmp.c b/ImageMagick-7.1.2-4/coders/wbmp.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wbmp.c
rename to ImageMagick-7.1.2-4/coders/wbmp.c
diff --git a/ImageMagick-7.1.2-3/coders/wbmp.h b/ImageMagick-7.1.2-4/coders/wbmp.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wbmp.h
rename to ImageMagick-7.1.2-4/coders/wbmp.h
diff --git a/ImageMagick-7.1.2-3/coders/webp.c b/ImageMagick-7.1.2-4/coders/webp.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/webp.c
rename to ImageMagick-7.1.2-4/coders/webp.c
diff --git a/ImageMagick-7.1.2-3/coders/webp.h b/ImageMagick-7.1.2-4/coders/webp.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/webp.h
rename to ImageMagick-7.1.2-4/coders/webp.h
diff --git a/ImageMagick-7.1.2-3/coders/wmf.c b/ImageMagick-7.1.2-4/coders/wmf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wmf.c
rename to ImageMagick-7.1.2-4/coders/wmf.c
diff --git a/ImageMagick-7.1.2-3/coders/wmf.h b/ImageMagick-7.1.2-4/coders/wmf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wmf.h
rename to ImageMagick-7.1.2-4/coders/wmf.h
diff --git a/ImageMagick-7.1.2-3/coders/wpg.c b/ImageMagick-7.1.2-4/coders/wpg.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wpg.c
rename to ImageMagick-7.1.2-4/coders/wpg.c
diff --git a/ImageMagick-7.1.2-3/coders/wpg.h b/ImageMagick-7.1.2-4/coders/wpg.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/wpg.h
rename to ImageMagick-7.1.2-4/coders/wpg.h
diff --git a/ImageMagick-7.1.2-3/coders/x.c b/ImageMagick-7.1.2-4/coders/x.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/x.c
rename to ImageMagick-7.1.2-4/coders/x.c
diff --git a/ImageMagick-7.1.2-3/coders/x.h b/ImageMagick-7.1.2-4/coders/x.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/x.h
rename to ImageMagick-7.1.2-4/coders/x.h
diff --git a/ImageMagick-7.1.2-3/coders/xbm.c b/ImageMagick-7.1.2-4/coders/xbm.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xbm.c
rename to ImageMagick-7.1.2-4/coders/xbm.c
diff --git a/ImageMagick-7.1.2-3/coders/xbm.h b/ImageMagick-7.1.2-4/coders/xbm.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xbm.h
rename to ImageMagick-7.1.2-4/coders/xbm.h
diff --git a/ImageMagick-7.1.2-3/coders/xc.c b/ImageMagick-7.1.2-4/coders/xc.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xc.c
rename to ImageMagick-7.1.2-4/coders/xc.c
diff --git a/ImageMagick-7.1.2-3/coders/xc.h b/ImageMagick-7.1.2-4/coders/xc.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xc.h
rename to ImageMagick-7.1.2-4/coders/xc.h
diff --git a/ImageMagick-7.1.2-3/coders/xcf.c b/ImageMagick-7.1.2-4/coders/xcf.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xcf.c
rename to ImageMagick-7.1.2-4/coders/xcf.c
diff --git a/ImageMagick-7.1.2-3/coders/xcf.h b/ImageMagick-7.1.2-4/coders/xcf.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xcf.h
rename to ImageMagick-7.1.2-4/coders/xcf.h
diff --git a/ImageMagick-7.1.2-3/coders/xpm.c b/ImageMagick-7.1.2-4/coders/xpm.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xpm.c
rename to ImageMagick-7.1.2-4/coders/xpm.c
diff --git a/ImageMagick-7.1.2-3/coders/xpm.h b/ImageMagick-7.1.2-4/coders/xpm.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xpm.h
rename to ImageMagick-7.1.2-4/coders/xpm.h
diff --git a/ImageMagick-7.1.2-3/coders/xps.c b/ImageMagick-7.1.2-4/coders/xps.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xps.c
rename to ImageMagick-7.1.2-4/coders/xps.c
diff --git a/ImageMagick-7.1.2-3/coders/xps.h b/ImageMagick-7.1.2-4/coders/xps.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xps.h
rename to ImageMagick-7.1.2-4/coders/xps.h
diff --git a/ImageMagick-7.1.2-3/coders/xwd.c b/ImageMagick-7.1.2-4/coders/xwd.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xwd.c
rename to ImageMagick-7.1.2-4/coders/xwd.c
diff --git a/ImageMagick-7.1.2-3/coders/xwd.h b/ImageMagick-7.1.2-4/coders/xwd.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/xwd.h
rename to ImageMagick-7.1.2-4/coders/xwd.h
diff --git a/ImageMagick-7.1.2-3/coders/yaml.c b/ImageMagick-7.1.2-4/coders/yaml.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/yaml.c
rename to ImageMagick-7.1.2-4/coders/yaml.c
diff --git a/ImageMagick-7.1.2-3/coders/yaml.h b/ImageMagick-7.1.2-4/coders/yaml.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/yaml.h
rename to ImageMagick-7.1.2-4/coders/yaml.h
diff --git a/ImageMagick-7.1.2-3/coders/ycbcr.c b/ImageMagick-7.1.2-4/coders/ycbcr.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ycbcr.c
rename to ImageMagick-7.1.2-4/coders/ycbcr.c
diff --git a/ImageMagick-7.1.2-3/coders/ycbcr.h b/ImageMagick-7.1.2-4/coders/ycbcr.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/ycbcr.h
rename to ImageMagick-7.1.2-4/coders/ycbcr.h
diff --git a/ImageMagick-7.1.2-3/coders/yuv.c b/ImageMagick-7.1.2-4/coders/yuv.c
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/yuv.c
rename to ImageMagick-7.1.2-4/coders/yuv.c
diff --git a/ImageMagick-7.1.2-3/coders/yuv.h b/ImageMagick-7.1.2-4/coders/yuv.h
similarity index 100%
rename from ImageMagick-7.1.2-3/coders/yuv.h
rename to ImageMagick-7.1.2-4/coders/yuv.h
diff --git a/ImageMagick-7.1.2-3/configs/arm/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-4/configs/arm/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-3/configs/arm/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-4/configs/arm/MagickCore/magick-baseconfig.h
index 6baa9e0a5..808cb21ad 100644
--- a/ImageMagick-7.1.2-3/configs/arm/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-4/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-3"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-4"
 #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-3"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-3"
+#define MAGICKCORE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-3/configs/arm/MagickCore/version.h b/ImageMagick-7.1.2-4/configs/arm/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-3/configs/arm/MagickCore/version.h
rename to ImageMagick-7.1.2-4/configs/arm/MagickCore/version.h
index 066791078..6271d425d 100644
--- a/ImageMagick-7.1.2-3/configs/arm/MagickCore/version.h
+++ b/ImageMagick-7.1.2-4/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  "-3"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "arm"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-3"
+#define MagickppLibAddendum  "-4"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-08-28"
+#define MagickReleaseDate  "2025-10-03"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-3/configs/arm64/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-4/configs/arm64/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-3/configs/arm64/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-4/configs/arm64/MagickCore/magick-baseconfig.h
index aefcd73c0..c8b40d7fd 100644
--- a/ImageMagick-7.1.2-3/configs/arm64/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-4/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-3"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-4"
 #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-3"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-3"
+#define MAGICKCORE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-3/configs/arm64/MagickCore/version.h b/ImageMagick-7.1.2-4/configs/arm64/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-3/configs/arm64/MagickCore/version.h
rename to ImageMagick-7.1.2-4/configs/arm64/MagickCore/version.h
index 3a825876f..b720639e9 100644
--- a/ImageMagick-7.1.2-3/configs/arm64/MagickCore/version.h
+++ b/ImageMagick-7.1.2-4/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  "-3"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "aarch64"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-3"
+#define MagickppLibAddendum  "-4"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-08-28"
+#define MagickReleaseDate  "2025-10-03"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-3/configs/x86-64/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-4/configs/x86-64/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-3/configs/x86-64/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-4/configs/x86-64/MagickCore/magick-baseconfig.h
index 7524c3462..0e2fc7bd9 100644
--- a/ImageMagick-7.1.2-3/configs/x86-64/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-4/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-3"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-4"
 #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-3"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-3"
+#define MAGICKCORE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-3/configs/x86-64/MagickCore/version.h b/ImageMagick-7.1.2-4/configs/x86-64/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-3/configs/x86-64/MagickCore/version.h
rename to ImageMagick-7.1.2-4/configs/x86-64/MagickCore/version.h
index 1f5c24ff6..ed548163a 100644
--- a/ImageMagick-7.1.2-3/configs/x86-64/MagickCore/version.h
+++ b/ImageMagick-7.1.2-4/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  "-3"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "x86_64"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-3"
+#define MagickppLibAddendum  "-4"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-08-28"
+#define MagickReleaseDate  "2025-10-03"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-3/configs/x86/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.2-4/configs/x86/MagickCore/magick-baseconfig.h
similarity index 99%
rename from ImageMagick-7.1.2-3/configs/x86/MagickCore/magick-baseconfig.h
rename to ImageMagick-7.1.2-4/configs/x86/MagickCore/magick-baseconfig.h
index b5d9d46d1..9bc50bc29 100644
--- a/ImageMagick-7.1.2-3/configs/x86/MagickCore/magick-baseconfig.h
+++ b/ImageMagick-7.1.2-4/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-3"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.2-4"
 #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-3"
+#define MAGICKCORE_PACKAGE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have PANGOCAIRO library */
@@ -1435,7 +1435,7 @@
 
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "7.1.2-3"
+#define MAGICKCORE_VERSION "7.1.2-4"
 #endif
 
 /* Define if you have WEBPMUX library */
diff --git a/ImageMagick-7.1.2-3/configs/x86/MagickCore/version.h b/ImageMagick-7.1.2-4/configs/x86/MagickCore/version.h
similarity index 96%
rename from ImageMagick-7.1.2-3/configs/x86/MagickCore/version.h
rename to ImageMagick-7.1.2-4/configs/x86/MagickCore/version.h
index 3be0e6b4f..8c8ba7676 100644
--- a/ImageMagick-7.1.2-3/configs/x86/MagickCore/version.h
+++ b/ImageMagick-7.1.2-4/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  "-3"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  10
 #define MagickLibMinInterface  10
 #define MagickPlatform  "x86"
 #define MagickppLibVersionText  "7.1.2"
 #define MagickppLibVersionNumber  5:0:0
-#define MagickppLibAddendum  "-3"
+#define MagickppLibAddendum  "-4"
 #define MagickppLibInterface  5
 #define MagickppLibMinInterface  5
-#define MagickReleaseDate  "2025-08-28"
+#define MagickReleaseDate  "2025-10-03"
 #define MagickAuthoritativeLicense  \
   "https://imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "https://imagemagick.org"
diff --git a/ImageMagick-7.1.2-3/filters/analyze.c b/ImageMagick-7.1.2-4/filters/analyze.c
similarity index 100%
rename from ImageMagick-7.1.2-3/filters/analyze.c
rename to ImageMagick-7.1.2-4/filters/analyze.c
diff --git a/ImageMagick-7.1.2-3/oss-fuzz/encoder_format.h b/ImageMagick-7.1.2-4/oss-fuzz/encoder_format.h
similarity index 100%
rename from ImageMagick-7.1.2-3/oss-fuzz/encoder_format.h
rename to ImageMagick-7.1.2-4/oss-fuzz/encoder_format.h
diff --git a/ImageMagick-7.1.2-3/utilities/magick.c b/ImageMagick-7.1.2-4/utilities/magick.c
similarity index 100%
rename from ImageMagick-7.1.2-3/utilities/magick.c
rename to ImageMagick-7.1.2-4/utilities/magick.c
diff --git a/README.md b/README.md
index 5fc46abbf..7bfe7f026 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# Android ImageMagick 7.1.2-3
+# Android ImageMagick 7.1.2-4
 
 [![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)