From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 30 Aug 2011 01:44:23 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acd2ed254c18c254a0ab5aafa06d1645e5d079d8;p=imagemagick

---

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index c53016ede..54a670cae 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -848,7 +848,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image,
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index ac76101ea..caf9d99f9 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1648,26 +1648,26 @@ MagickExport Quantum *GetAuthenticPixelCacheNexus(Image *image,
     *cache_info;
 
   Quantum
-    *pixels;
+    *q;
 
   /*
     Transfer pixels from the cache.
   */
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
-  pixels=QueueAuthenticNexus(image,x,y,columns,rows,nexus_info,exception);
-  if (pixels == (Quantum *) NULL)
+  q=QueueAuthenticNexus(image,x,y,columns,rows,nexus_info,exception);
+  if (q == (Quantum *) NULL)
     return((Quantum *) NULL);
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
-    return(pixels);
+    return(q);
   if (ReadPixelCachePixels(cache_info,nexus_info,exception) == MagickFalse)
     return((Quantum *) NULL);
   if (cache_info->metacontent_extent != 0)
     if (ReadPixelCacheMetacontent(cache_info,nexus_info,exception) == MagickFalse)
       return((Quantum *) NULL);
-  return(pixels);
+  return(q);
 }
 
 /*
@@ -1809,7 +1809,7 @@ MagickExport Quantum *GetAuthenticPixels(Image *image,const ssize_t x,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *q;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1819,14 +1819,14 @@ MagickExport Quantum *GetAuthenticPixels(Image *image,const ssize_t x,
   if (cache_info->methods.get_authentic_pixels_handler !=
       (GetAuthenticPixelsHandler) NULL)
     {
-      pixels=cache_info->methods.get_authentic_pixels_handler(image,x,y,columns,
-        rows,exception);
-      return(pixels);
+      q=cache_info->methods.get_authentic_pixels_handler(image,x,y,columns,rows,
+        exception);
+      return(q);
     }
   assert(id < (int) cache_info->number_threads);
-  pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
+  q=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
     cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(q);
 }
 
 /*
@@ -1871,7 +1871,7 @@ static Quantum *GetAuthenticPixelsCache(Image *image,const ssize_t x,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *q;
 
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -1881,9 +1881,9 @@ static Quantum *GetAuthenticPixelsCache(Image *image,const ssize_t x,
     return((Quantum *) NULL);
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
+  q=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
     cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(q);
 }
 
 /*
@@ -2247,7 +2247,7 @@ MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
     id = GetOpenMPThreadId();
 
   register const Quantum
-    *pixels;
+    *p;
 
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -2255,12 +2255,12 @@ MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  pixels=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
+  p=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
     1UL,1UL,cache_info->nexus_info[id],exception);
   GetPixelInfo(image,pixel);
-  if (pixels == (const Quantum *) NULL)
+  if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  SetPixelInfo(image,pixels,pixel);
+  SetPixelInfo(image,p,pixel);
   return(MagickTrue);
 }
 
@@ -3191,6 +3191,7 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
   pixels=SetPixelCacheNexusPixels(image,&region,nexus_info,exception);
   if (pixels == (Quantum *) NULL)
     return((const Quantum *) NULL);
+  q=pixels;
   offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
     nexus_info->region.x;
   length=(MagickSizeType) (nexus_info->region.height-1L)*cache_info->columns+
@@ -3207,7 +3208,7 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
           Pixel request is inside cache extents.
         */
         if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
-          return(pixels);
+          return(q);
         status=ReadPixelCachePixels(cache_info,nexus_info,exception);
         if (status == MagickFalse)
           return((const Quantum *) NULL);
@@ -3217,12 +3218,11 @@ MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
             if (status == MagickFalse)
               return((const Quantum *) NULL);
           }
-        return(pixels);
+        return(q);
       }
   /*
     Pixel request is outside cache extents.
   */
-  q=pixels;
   s=(unsigned char *) GetPixelCacheNexusMetacontent(cache_info,nexus_info);
   virtual_nexus=AcquirePixelCacheNexus(1);
   if (virtual_nexus == (NexusInfo **) NULL)
@@ -3548,7 +3548,7 @@ static const Quantum *GetVirtualPixelCache(const Image *image,
     id = GetOpenMPThreadId();
 
   const Quantum
-    *pixels;
+    *p;
 
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -3556,9 +3556,9 @@ static const Quantum *GetVirtualPixelCache(const Image *image,
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
+  p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
     cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(p);
 }
 
 /*
@@ -3663,7 +3663,7 @@ MagickExport const Quantum *GetVirtualPixels(const Image *image,
     id = GetOpenMPThreadId();
 
   const Quantum
-    *pixels;
+    *p;
 
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -3675,9 +3675,9 @@ MagickExport const Quantum *GetVirtualPixels(const Image *image,
     return(cache_info->methods.get_virtual_pixel_handler(image,
       GetPixelCacheVirtualMethod(image),x,y,columns,rows,exception));
   assert(id < (int) cache_info->number_threads);
-  pixels=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
+  p=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
     columns,rows,cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(p);
 }
 
 /*
@@ -4459,7 +4459,7 @@ static Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *q;
 
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -4467,9 +4467,9 @@ static Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
+  q=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
     exception);
-  return(pixels);
+  return(q);
 }
 
 /*
@@ -4539,7 +4539,7 @@ MagickExport Quantum *QueueAuthenticPixels(Image *image,const ssize_t x,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *q;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -4549,14 +4549,14 @@ MagickExport Quantum *QueueAuthenticPixels(Image *image,const ssize_t x,
   if (cache_info->methods.queue_authentic_pixels_handler !=
        (QueueAuthenticPixelsHandler) NULL)
     {
-      pixels=cache_info->methods.queue_authentic_pixels_handler(image,x,y,
+      q=cache_info->methods.queue_authentic_pixels_handler(image,x,y,
         columns,rows,exception);
-      return(pixels);
+      return(q);
     }
   assert(id < (int) cache_info->number_threads);
-  pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
+  q=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
     exception);
-  return(pixels);
+  return(q);
 }
 
 /*
diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c
index 8fcdc9bf7..0c6daa495 100644
--- a/MagickCore/cipher.c
+++ b/MagickCore/cipher.c
@@ -651,7 +651,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
       *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
       pixels,exception);
@@ -857,7 +857,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
       *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
       pixels,exception);
diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index 9d09809de..265a11c08 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -221,7 +221,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -360,7 +360,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
       *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index ded7e8a45..02483fde8 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -263,7 +263,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -322,7 +322,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -377,7 +377,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -437,7 +437,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -497,7 +497,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -560,7 +560,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -663,7 +663,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1079,7 +1079,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1689,7 +1689,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1751,7 +1751,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1809,7 +1809,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1875,7 +1875,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1941,7 +1941,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -2010,7 +2010,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -2117,7 +2117,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -2490,7 +2490,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 61e98a152..57297191c 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -212,7 +212,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
     r=QueueCacheViewAuthenticPixels(highlight_view,0,y,highlight_image->columns,
       1,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL) || (r == (Quantum *) NULL))
+        (q == (Quantum *) NULL) || (r == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -357,7 +357,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -460,7 +460,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -573,7 +573,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
       reconstruct_image->columns,1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -678,7 +678,7 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         break;
@@ -807,7 +807,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
       reconstruct_image->columns,1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -928,7 +928,7 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion(
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -1058,7 +1058,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
       reconstruct_image->columns,1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -1515,7 +1515,7 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
@@ -1665,7 +1665,7 @@ static double GetNCCDistortion(const Image *image,
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
       1,exception);
-    if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 18d5ab0b8..22252238d 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2191,7 +2191,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           p-=x_offset*GetPixelChannels(composite_image);
       }
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/compress.c b/MagickCore/compress.c
index 6e735ed98..d29dd3bfb 100644
--- a/MagickCore/compress.c
+++ b/MagickCore/compress.c
@@ -629,7 +629,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image)
     */
     p=scanline;
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index bc4d90bce..4b8f3f431 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -402,7 +402,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
       continue;
     q=QueueCacheViewAuthenticPixels(frame_view,0,frame_info->y+y,
       frame_image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -698,7 +698,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -769,7 +769,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -830,7 +830,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 5465cb621..4d46fd3d5 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -2280,7 +2280,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
 
       q=QueueCacheViewAuthenticPixels(distort_view,0,j,distort_image->columns,1,
         exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
           continue;
@@ -2912,7 +2912,7 @@ MagickExport Image *SparseColorImage(const Image *image,
 
       q=GetCacheViewAuthenticPixels(sparse_view,0,j,sparse_image->columns,
         1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
           continue;
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 7e9ff0bc6..a61be98e3 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -315,7 +315,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,
     r=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception);
     q=QueueCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
       exception);
-    if ((r == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
+    if ((r == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {
         status=MagickFalse;
         continue;
@@ -1677,7 +1677,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
 
       q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
         1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       j++;
       for (x=0; x < (ssize_t) image->columns; x++)
@@ -2160,7 +2160,7 @@ MagickExport Image *MotionBlurImage(const Image *image,
       continue;
     q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2930,7 +2930,7 @@ MagickExport Image *RadialBlurImage(const Image *image,
       continue;
     q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3856,7 +3856,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
       continue;
     q=QueueCacheViewAuthenticPixels(spread_view,0,y,spread_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 2858ae832..d9f5fd22e 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -765,7 +765,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -922,7 +922,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1209,7 +1209,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1663,7 +1663,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1827,7 +1827,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1984,7 +1984,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2179,7 +2179,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2334,7 +2334,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2849,7 +2849,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3008,7 +3008,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -3071,7 +3071,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3293,7 +3293,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index b7fbf6767..36f04ce5e 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -294,7 +294,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
   {
     q=GetCacheViewAuthenticPixels(magnitude_view,0L,y,fourier_info->height,1UL,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0L; x < (ssize_t) fourier_info->width; x++)
     {
@@ -350,7 +350,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info,
   {
     q=GetCacheViewAuthenticPixels(phase_view,0L,y,fourier_info->height,1UL,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0L; x < (ssize_t) fourier_info->width; x++)
     {
@@ -1086,7 +1086,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info,
       break;
     q=GetCacheViewAuthenticPixels(image_view,0L,y,fourier_info->width >
       image->columns ? image->columns : fourier_info->width,1UL,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0L; x < (ssize_t) fourier_info->width; x++)
     {
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 7d6954cf0..f9ab8a393 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3208,7 +3208,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
       continue;
     q=GetCacheViewAuthenticPixels(implode_view,0,y,implode_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3613,7 +3613,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       (void) GetOneCacheViewVirtualPixel(image_view,x,(ssize_t)
         ceil(segment->y2-0.5),&v,exception);
       q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         return(MagickTrue);
       SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
         (u.red+v.red)/2.0,plasma),q);
@@ -3633,7 +3633,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           (void) GetOneCacheViewVirtualPixel(image_view,x,(ssize_t)
             ceil(segment->y2-0.5),&v,exception);
           q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             return(MagickTrue);
           SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma),q);
@@ -3660,7 +3660,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t)
             ceil(segment->x2-0.5),y,&v,exception);
           q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             return(MagickTrue);
           SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma),q);
@@ -3684,7 +3684,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
           (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t)
             ceil(segment->x2-0.5),y,&v,exception);
           q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             return(MagickTrue);
           SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
             (u.red+v.red)/2.0,plasma),q);
@@ -3710,7 +3710,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       y=(ssize_t) ceil(segment->y2-0.5);
       (void) GetOneCacheViewVirtualPixel(image_view,x,y,&v,exception);
       q=QueueCacheViewAuthenticPixels(image_view,x_mid,y_mid,1,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         return(MagickTrue);
       SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
         (u.red+v.red)/2.0,plasma),q);
@@ -4191,7 +4191,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
       continue;
     q=GetCacheViewAuthenticPixels(border_view,0,y,border_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -4335,7 +4335,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       continue;
     q=QueueCacheViewAuthenticPixels(random_view,0,y,random_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -4484,7 +4484,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -4631,7 +4631,7 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
         q=GetCacheViewAuthenticPixels(stegano_view,k % (ssize_t)
           stegano_image->columns,k/(ssize_t) stegano_image->columns,1,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         switch (c)
         {
@@ -4799,7 +4799,7 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
     q=GetVirtualPixels(right_image,0,y,right_image->columns,1,exception);
     r=QueueAuthenticPixels(stereo_image,0,y,stereo_image->columns,1,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL) || (r == (Quantum *) NULL))
+        (q == (Quantum *) NULL) || (r == (Quantum *) NULL))
       break;
     for (x=0; x < (ssize_t) stereo_image->columns; x++)
     {
@@ -4958,7 +4958,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
       continue;
     q=GetCacheViewAuthenticPixels(swirl_view,0,y,swirl_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -5411,7 +5411,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
       continue;
     q=QueueCacheViewAuthenticPixels(wave_view,0,y,wave_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index ac93dc4d5..7a07c421d 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -1268,7 +1268,7 @@ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view,
       {
         q=QueueCacheViewAuthenticPixels(unique_view,cube_info->x,0,1,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           continue;
         SetPixelRed(unique_image,p->red,q);
         SetPixelGreen(unique_image,p->green,q);
diff --git a/MagickCore/image.c b/MagickCore/image.c
index cb418ca46..b1a34f4dd 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2150,7 +2150,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
     if (status == MagickFalse)
       continue;
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2343,7 +2343,7 @@ MagickExport MagickBooleanType SeparateImage(Image *image)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2579,7 +2579,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -2745,7 +2745,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
     if (status == MagickFalse)
       continue;
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -2829,7 +2829,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
     if (status == MagickFalse)
       continue;
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3492,7 +3492,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -4149,7 +4149,7 @@ MagickExport MagickBooleanType SyncImage(Image *image)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index f767c0dd3..a9c9a7861 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -115,7 +115,7 @@ static void ClearBounds(Image *image,RectangleInfo *bounds)
       *restrict q;
 
     q=GetAuthenticPixels(image,bounds->x,bounds->y+y,bounds->width,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) bounds->width; x++)
     {
@@ -620,7 +620,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
     p=GetVirtualPixels(image1,x,0,1,image1->rows,exception);
     q=GetVirtualPixels(image2,x,0,1,image2->rows,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL))
+        (q == (Quantum *) NULL))
       break;
     for (y=0; y < (ssize_t) image1->rows; y++)
     {
@@ -651,7 +651,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
     p=GetVirtualPixels(image1,x,0,1,image1->rows,exception);
     q=GetVirtualPixels(image2,x,0,1,image2->rows,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL))
+        (q == (Quantum *) NULL))
       break;
     for (y=0; y < (ssize_t) image1->rows; y++)
     {
@@ -671,7 +671,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
     p=GetVirtualPixels(image1,0,y,image1->columns,1,exception);
     q=GetVirtualPixels(image2,0,y,image2->columns,1,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL))
+        (q == (Quantum *) NULL))
       break;
     for (x=0; x < (ssize_t) image1->columns; x++)
     {
@@ -691,7 +691,7 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2
     p=GetVirtualPixels(image1,0,y,image1->columns,1,exception);
     q=GetVirtualPixels(image2,0,y,image2->columns,1,exception);
     if ((p == (const Quantum *) NULL) ||
-        (q == (const Quantum *) NULL))
+        (q == (Quantum *) NULL))
       break;
     for (x=0; x < (ssize_t) image1->columns; x++)
     {
diff --git a/MagickCore/mac.c b/MagickCore/mac.c
index f441c361b..3fa8758b1 100644
--- a/MagickCore/mac.c
+++ b/MagickCore/mac.c
@@ -1355,7 +1355,7 @@ MagickExport Image *ReadPICTImage(const ImageInfo *image_info,
       *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < image->columns; x++)
     {
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 44f173b40..8b0699309 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1226,7 +1226,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                 continue;
               q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 {
                   status=MagickFalse;
                   continue;
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 85c648855..c863e0cbc 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -564,7 +564,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1519,7 +1519,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1784,7 +1784,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view,
       */
       exception=(&image->exception);
       q=GetCacheViewAuthenticPixels(image_view,p->x,p->y,1,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         return(MagickFalse);
       AssociateAlphaPixel(image,cube_info,q,&pixel);
       for (i=0; i < ErrorQueueLength; i++)
@@ -2372,7 +2372,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -3265,7 +3265,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -3339,7 +3339,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index da2df3851..ac79ff48d 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2926,7 +2926,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
 
     q=QueueCacheViewAuthenticPixels(scale_view,0,y,scale_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     alpha=1.0;
     if (scale_image->rows == image->rows)
diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index beb7e72b4..3d66c910e 100644
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -551,7 +551,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 5f8114668..6cf7d1eda 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1133,7 +1133,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
             q=QueueCacheViewAuthenticPixels(rotate_view,(ssize_t)
               (rotate_image->columns-(tile_y+height)),y+tile_x,height,1,
               exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               {
                 status=MagickFalse;
                 break;
@@ -1342,7 +1342,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations,
 
             q=QueueCacheViewAuthenticPixels(rotate_view,tile_y,(ssize_t) (y+
               rotate_image->rows-(tile_x+width)),height,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               {
                 status=MagickFalse;
                 break;
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 0283e3b64..0335ada5d 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -504,7 +504,7 @@ MagickExport Image *EvaluateImages(const Image *images,
         continue;
       q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,evaluate_image->columns,
         1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
           continue;
@@ -608,7 +608,7 @@ MagickExport Image *EvaluateImages(const Image *images,
         continue;
       q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,evaluate_image->columns,
         1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
           continue;
@@ -748,7 +748,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -958,7 +958,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index d29bc4209..99a13e21e 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -489,15 +489,17 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image,
   PixelPacket *pixel,ExceptionInfo *exception)
 {
   const Quantum
-    *q;
+    *p;
 
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   *pixel=image->background_color;
-  q=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
-  if (q != (const Quantum *) NULL)
+  p=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
+  if (p == (const Quantum *) NULL)
     return(MagickFalse);
-  GetPixelPacket(image,q,pixel);
+  GetPixelPacket(image,p,pixel);
+  if (image->colorspace == CMYKColorspace)
+    pixel->black=GetPixelBlack(image,p);
   return(MagickTrue);
 }
 
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 9b17ebd61..b55ff7da7 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -389,7 +389,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -536,7 +536,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -694,7 +694,7 @@ MagickExport MagickBooleanType ClampImage(Image *image)
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1362,7 +1362,7 @@ printf("DEBUG levels  r=%u g=%u b=%u a=%u i=%u\n",
       if (status == MagickFalse)
         continue;
       q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
           continue;
@@ -1567,7 +1567,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image,
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           {
             status=MagickFalse;
             continue;
@@ -1636,7 +1636,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
@@ -1844,7 +1844,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image,
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 68614a3f9..1f9000d0f 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -565,7 +565,7 @@ MagickExport MagickBooleanType XAnnotateImage(Display *display,
 
     q=GetCacheViewAuthenticPixels(annotate_view,0,(ssize_t) y,
       annotate_image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (int) annotate_image->columns; x++)
     {
@@ -2479,7 +2479,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
 
     q=QueueCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns,
       1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (int) draw_image->columns; x++)
     {
@@ -2604,7 +2604,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
 
     q=GetCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns,1,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (int) draw_image->columns; x++)
     {
@@ -4390,7 +4390,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
               {
                 q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
                   composite_image->columns,1,exception);
-                if (q == (const Quantum *) NULL)
+                if (q == (Quantum *) NULL)
                   break;
                 for (x=0; x < (int) composite_image->columns; x++)
                 {
@@ -4414,7 +4414,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
               {
                 q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
                   composite_image->columns,1,exception);
-                if (q == (const Quantum *) NULL)
+                if (q == (Quantum *) NULL)
                   break;
                 for (x=0; x < (int) composite_image->columns; x++)
                 {
@@ -4465,7 +4465,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
             {
               q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
                 composite_image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (int) composite_image->columns; x++)
               {
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index a70f5bb7c..4acb036fc 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1077,7 +1077,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             {
               q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) mask_image->columns; x++)
               {
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 7bfb67430..04d7bbc84 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -13404,7 +13404,7 @@ SetPixel(ref,...)
     (void) SetImageStorageClass(image,DirectClass,exception);
     channel_mask=SetPixelChannelMask(image,channel);
     q=GetAuthenticPixels(image,region.x,region.y,1,1,exception);
-    if ((q == (const Quantum *) NULL) || (av == (AV *) NULL) ||
+    if ((q == (Quantum *) NULL) || (av == (AV *) NULL) ||
         (SvTYPE(av) != SVt_PVAV))
       PUSHs(&sv_undef);
     else
diff --git a/coders/aai.c b/coders/aai.c
index 5e767e71a..f4367a866 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -171,7 +171,7 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(CorruptImageError,"UnableToReadImageData");
       p=pixels;
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/art.c b/coders/art.c
index 29b90ae4a..44aa3f237 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -166,7 +166,7 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     count=ReadBlob(image,length,pixels);
     if (count != (ssize_t) length)
diff --git a/coders/avs.c b/coders/avs.c
index 5f03d1d63..20cb2374d 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -170,7 +170,7 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(CorruptImageError,"UnableToReadImageData");
       p=pixels;
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/bgr.c b/coders/bgr.c
index 00106e942..774a61256 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -229,7 +229,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,quantum_type,pixels,exception);
@@ -243,7 +243,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -311,7 +311,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             quantum_type=quantum_types[i];
             q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
               exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
               quantum_info,quantum_type,pixels,exception);
@@ -325,7 +325,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                   image->columns,1,exception);
                 if ((p == (const Quantum *) NULL) ||
-                    (q == (const Quantum *) NULL))
+                    (q == (Quantum *) NULL))
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
@@ -406,7 +406,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -420,7 +420,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -458,7 +458,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -472,7 +472,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -510,7 +510,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -524,7 +524,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -570,7 +570,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,AlphaQuantum,pixels,exception);
@@ -585,7 +585,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
@@ -658,7 +658,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -672,7 +672,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -729,7 +729,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -743,7 +743,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -800,7 +800,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -814,7 +814,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -873,7 +873,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,BlueQuantum,pixels,exception);
@@ -887,7 +887,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
diff --git a/coders/bmp.c b/coders/bmp.c
index 955e7920c..81e2a9fca 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1001,7 +1001,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < ((ssize_t) image->columns-7); x+=8)
           {
@@ -1045,7 +1045,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           {
@@ -1089,7 +1089,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x = (ssize_t)image->columns; x != 0; --x)
           {
@@ -1132,7 +1132,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -1190,7 +1190,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -1233,7 +1233,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           p=pixels+(image->rows-y-1)*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
diff --git a/coders/cin.c b/coders/cin.c
index 16aa6a881..ed86961dc 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -707,7 +707,7 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     count=ReadBlob(image,length,pixels);
     if ((size_t) count != length)
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 59792ab18..57838fe7e 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -210,7 +210,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info,
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
diff --git a/coders/cmyk.c b/coders/cmyk.c
index 7f13ffc4b..17a92b86c 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -228,7 +228,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,quantum_type,pixels,exception);
@@ -242,7 +242,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -312,7 +312,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             quantum_type=quantum_types[i];
             q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
               exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
               quantum_info,quantum_type,pixels,exception);
@@ -326,7 +326,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                   image->columns,1,exception);
                 if ((p == (const Quantum *) NULL) ||
-                    (q == (const Quantum *) NULL))
+                    (q == (Quantum *) NULL))
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
@@ -407,7 +407,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,CyanQuantum,pixels,exception);
@@ -421,7 +421,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -459,7 +459,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,MagentaQuantum,pixels,exception);
@@ -473,7 +473,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -511,7 +511,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,YellowQuantum,pixels,exception);
@@ -525,7 +525,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -563,7 +563,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlackQuantum,pixels,exception);
@@ -577,7 +577,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -617,7 +617,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,AlphaQuantum,pixels,exception);
@@ -632,7 +632,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
@@ -705,7 +705,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,CyanQuantum,pixels,exception);
@@ -719,7 +719,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -776,7 +776,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,MagentaQuantum,pixels,exception);
@@ -790,7 +790,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -847,7 +847,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,YellowQuantum,pixels,exception);
@@ -861,7 +861,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -918,7 +918,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlackQuantum,pixels,exception);
@@ -932,7 +932,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -991,7 +991,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,YellowQuantum,pixels,exception);
@@ -1005,7 +1005,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
diff --git a/coders/cut.c b/coders/cut.c
index 091d49999..05a7bb375 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -110,7 +110,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
     case 1:  /* Convert bitmap scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
@@ -139,7 +139,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
     case 2:  /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
@@ -186,7 +186,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
     case 4:  /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
@@ -212,7 +212,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image)
     case 8: /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL) break;
+        if (q == (Quantum *) NULL) break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           index=ConstrainColormapIndex(image,*p);
diff --git a/coders/dcm.c b/coders/dcm.c
index b207379a5..36b7d6995 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3719,7 +3719,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
@@ -3794,7 +3794,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -3923,7 +3923,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/dds.c b/coders/dds.c
index dc7a79687..0421b7573 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -529,7 +529,7 @@ static MagickBooleanType ReadDXT1(Image *image, DDSInfo *dds_info)
       q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
         Min(4, dds_info->height - y),exception);
       
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         return MagickFalse;
       
       /* Read 8 bytes of data from the image */
@@ -703,7 +703,7 @@ static MagickBooleanType ReadDXT5(Image *image, DDSInfo *dds_info)
       q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
                          Min(4, dds_info->height - y),exception);
       
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         return MagickFalse;
       
       /* Read alpha values (8 bytes) */
diff --git a/coders/dib.c b/coders/dib.c
index fe24d506f..20bcc8f47 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -648,7 +648,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         p=pixels+(image->rows-y-1)*bytes_per_line;
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
@@ -692,7 +692,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         p=pixels+(image->rows-y-1)*bytes_per_line;
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
@@ -736,7 +736,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         p=pixels+(image->rows-y-1)*bytes_per_line;
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
@@ -773,7 +773,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         p=pixels+(image->rows-y-1)*bytes_per_line;
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
@@ -821,7 +821,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         p=pixels+(image->rows-y-1)*bytes_per_line;
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
diff --git a/coders/dps.c b/coders/dps.c
index 22dfcffc0..94c866e08 100644
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -374,7 +374,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -396,7 +396,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -447,7 +447,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
@@ -494,7 +494,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
               for (y=0; y < (ssize_t) image->rows; y++)
               {
                 q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-                if (q == (const Quantum *) NULL)
+                if (q == (Quantum *) NULL)
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
diff --git a/coders/dpx.c b/coders/dpx.c
index 0dd07c914..3309fee5a 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1112,7 +1112,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (count != (ssize_t) extent)
       status=MagickFalse;
     q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/coders/emf.c b/coders/emf.c
index 777890584..737091a20 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -611,7 +611,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/exr.c b/coders/exr.c
index 7de2dd8d2..94a6cf5fb 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -218,7 +218,7 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     ImfInputSetFrameBuffer(file,scanline-min_x-image->columns*(min_y+y),1,
       image->columns);
diff --git a/coders/fits.c b/coders/fits.c
index 4cd6a9c2a..1bb86ca7a 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -439,7 +439,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
     for (y=(ssize_t) image->rows-1; y >= 0; y--)
     {
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/fpx.c b/coders/fpx.c
index 49093c7f7..67c950c20 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -425,7 +425,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     if ((y % tile_height) == 0)
       {
diff --git a/coders/gif.c b/coders/gif.c
index dad4812ba..27e0f60ad 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -437,7 +437,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity)
       *restrict q;
 
     q=GetAuthenticPixels(image,0,offset,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; )
     {
diff --git a/coders/gray.c b/coders/gray.c
index 53a562c90..2983c289b 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -207,7 +207,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
           break;
         }
       q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,quantum_info,
         quantum_type,pixels,exception);
@@ -221,7 +221,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
           q=QueueAuthenticPixels(image,0,y-image->extract_info.y,image->columns,
             1,exception);
           if ((p == (const Quantum *) NULL) ||
-              (q == (const Quantum *) NULL))
+              (q == (Quantum *) NULL))
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
diff --git a/coders/hald.c b/coders/hald.c
index 95d075b18..ddd870dcf 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -137,7 +137,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
       continue;
     q=QueueAuthenticPixels(image,0,y,image->columns,(size_t) level,
       exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       {
         status=MagickFalse;
         continue;
diff --git a/coders/hdr.c b/coders/hdr.c
index b69555a79..8281e40e6 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -445,7 +445,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
           }
       }
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     i=0;
     for (x=0; x < (ssize_t) image->columns; x++)
diff --git a/coders/histogram.c b/coders/histogram.c
index f20d39014..405e645bc 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -298,7 +298,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   for (x=0; x < (ssize_t) histogram_image->columns; x++)
   {
     q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
       {
diff --git a/coders/hrz.c b/coders/hrz.c
index a59689860..4cc6ce855 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -154,7 +154,7 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception)
       ThrowReaderException(CorruptImageError,"UnableToReadImageData");
     p=pixels;
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/icon.c b/coders/icon.c
index 4893400b9..92d1ee68c 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -400,7 +400,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) (image->columns-7); x+=8)
               {
@@ -444,7 +444,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < ((ssize_t) image->columns-1); x+=2)
               {
@@ -482,7 +482,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -512,7 +512,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -544,7 +544,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -588,7 +588,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             for (y=(ssize_t) image->rows-1; y >= 0; y--)
             {
               q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < ((ssize_t) image->columns-7); x+=8)
               {
diff --git a/coders/ipl.c b/coders/ipl.c
index 5d5872e6c..e6c0ebe8a 100644
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -341,7 +341,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for(y = 0; y < (ssize_t) image->rows; y++){
         (void) ReadBlob(image, length*image->depth/8, pixels);
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
                 break;
         (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
           GrayQuantum,pixels,exception);
@@ -353,7 +353,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for(y = 0; y < (ssize_t) image->rows; y++){
         (void) ReadBlob(image, length*image->depth/8, pixels);
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
                 break;
         (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
           RedQuantum,pixels,exception);  
@@ -363,7 +363,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for(y = 0; y < (ssize_t) image->rows; y++){
         (void) ReadBlob(image, length*image->depth/8, pixels);
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
           GreenQuantum,pixels,exception);
@@ -373,7 +373,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for(y = 0; y < (ssize_t) image->rows; y++){
         (void) ReadBlob(image, length*image->depth/8, pixels);
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
           BlueQuantum,pixels,exception);
diff --git a/coders/jbig.c b/coders/jbig.c
index 0ad47c5d5..ac85f397d 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -220,7 +220,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     bit=0;
     byte=0;
diff --git a/coders/jp2.c b/coders/jp2.c
index a17cd8b30..df0850342 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -522,7 +522,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (i=0; i < (ssize_t) number_components; i++)
       (void) jas_image_readcmpt(jp2_image,(short) components[i],0,
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 0c033aae4..69f7d1772 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1243,7 +1243,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       }
     p=jpeg_pixels;
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     if (jpeg_info.data_precision > 8)
       {
diff --git a/coders/mac.c b/coders/mac.c
index 9d9216222..3af844afd 100644
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -179,7 +179,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (offset >= (ssize_t) length)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               p=pixels;
               bit=0;
@@ -214,7 +214,7 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (offset >= (ssize_t) length)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           p=pixels;
           bit=0;
diff --git a/coders/map.c b/coders/map.c
index e1bdf6ce6..16fb68da4 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -211,7 +211,7 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception)
   {
     p=pixels;
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     count=ReadBlob(image,(size_t) packet_size*image->columns,pixels);
     if (count != (ssize_t) (packet_size*image->columns))
diff --git a/coders/mat.c b/coders/mat.c
index a5fd169e7..ba1bd3413 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -194,7 +194,7 @@ static void InsertComplexDoubleRow(double *p, int y, Image * image, double MinVa
 
   exception=(&image->exception);
   q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-  if (q == (const Quantum *) NULL)
+  if (q == (Quantum *) NULL)
     return;
   for (x = 0; x < (ssize_t) image->columns; x++)
   {
@@ -260,7 +260,7 @@ static void InsertComplexFloatRow(float *p, int y, Image * image, double MinVal,
 
   exception=(&image->exception);
   q = QueueAuthenticPixels(image, 0, y, image->columns, 1,exception);
-  if (q == (const Quantum *) NULL)
+  if (q == (Quantum *) NULL)
     return;
   for (x = 0; x < (ssize_t) image->columns; x++)
   {
@@ -889,7 +889,7 @@ MATLAB_KO: ThrowReaderException(CorruptImageError,"ImproperImageHeader");
       for (i = 0; i < (ssize_t) MATLAB_HDR.SizeY; i++)
       {
         q=QueueAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception);
-        if (q == (const Quantum *)NULL)
+        if (q == (Quantum *)NULL)
   {
     if (logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(),
               "  MAT set image pixels returns unexpected NULL on a row %u.", (unsigned)(MATLAB_HDR.SizeY-i-1));
diff --git a/coders/miff.c b/coders/miff.c
index 7f7dd133c..b4dbd1e9c 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1309,7 +1309,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
       if (status == MagickFalse)
         break;
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       switch (image->compression)
       {
diff --git a/coders/mono.c b/coders/mono.c
index d44c45e9b..9139189a7 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -156,7 +156,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     bit=0;
     byte=0;
diff --git a/coders/mtv.c b/coders/mtv.c
index 09f2692be..1bffc8402 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -172,7 +172,7 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(CorruptImageError,"UnableToReadImageData");
       p=pixels;
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/null.c b/coders/null.c
index 53d555ce4..b78f1a30b 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -134,7 +134,7 @@ static Image *ReadNULLImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/otb.c b/coders/otb.c
index a1542b96c..508955661 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -170,7 +170,7 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     bit=0;
     byte=0;
diff --git a/coders/palm.c b/coders/palm.c
index 4b5bda26a..c906c29c0 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -463,7 +463,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info,
         }
       ptr=one_row;
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       if (bits_per_pixel == 16)
         {
diff --git a/coders/pcd.c b/coders/pcd.c
index 36c096b83..824ee6a99 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -669,7 +669,7 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -777,7 +777,7 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
@@ -1034,7 +1034,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
     }
     q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
       1,&downsample_image->exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) downsample_image->columns; x++)
     {
@@ -1044,7 +1044,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
     }
     q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
       1,&downsample_image->exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) downsample_image->columns; x++)
     {
diff --git a/coders/pcx.c b/coders/pcx.c
index 1ce40f776..e55453086 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -478,7 +478,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     {
       p=pcx_pixels+(y*pcx_info.bytes_per_line*pcx_info.planes);
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       r=scanline;
       if (image->storage_class == DirectClass)
diff --git a/coders/pdb.c b/coders/pdb.c
index bdeb799d6..363bc6d91 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -434,7 +434,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
@@ -464,7 +464,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x+=4)
         {
@@ -500,7 +500,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x+=2)
         {
diff --git a/coders/pict.c b/coders/pict.c
index 0a6deeac0..e851b6ace 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1163,7 +1163,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
                 ThrowReaderException(CorruptImageError,"NotEnoughPixelData");
               q=QueueAuthenticPixels(tile_image,0,y,tile_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) tile_image->columns; x++)
               {
diff --git a/coders/pix.c b/coders/pix.c
index bc0dbd144..323d18abd 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -167,7 +167,7 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     for (y=0; y < (ssize_t) image->rows; y++)
     {
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/plasma.c b/coders/plasma.c
index 61ac23218..a6cfe10ac 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -112,7 +112,7 @@ static inline void PlasmaPixel(Image *image,RandomInfo *random_info,double x,
   exception=(&image->exception);
   q=GetAuthenticPixels(image,(ssize_t) ceil(x-0.5),(ssize_t) ceil(y-0.5),1,1,
     exception);
-  if (q == (const Quantum *) NULL)
+  if (q == (Quantum *) NULL)
     return;
   range=GetQuantumRange(16UL);
   SetPixelRed(image,ScaleAnyToQuantum((size_t) (65535.0*
@@ -170,7 +170,7 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/png.c b/coders/png.c
index 850d0b812..91c519441 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2887,7 +2887,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
           png_read_row(ping,ping_pixels+row_offset,NULL);
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
 
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
 
           if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY)
@@ -3007,7 +3007,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
         png_read_row(ping,ping_pixels+row_offset,NULL);
         q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
 
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
 
         p=ping_pixels+row_offset;
@@ -3149,7 +3149,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 
         q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
 
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
@@ -3278,7 +3278,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
             image->storage_class=storage_class;
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
 
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
 
 
@@ -7976,7 +7976,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
      {
        q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
 
-       if (q == (const Quantum *) NULL)
+       if (q == (Quantum *) NULL)
          break;
 
        for (x=0; x < (ssize_t) image->columns; x++)
@@ -8141,7 +8141,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
              {
                q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
 
-               if (q == (const Quantum *) NULL)
+               if (q == (Quantum *) NULL)
                  break;
 
                s=q;
@@ -8278,7 +8278,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               q=GetAuthenticPixels(image,0,y,image->columns,1,
                   exception);
 
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
 
 
@@ -8696,7 +8696,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
            {
              q=GetVirtualPixels(image,0,y,image->columns,1, exception);
 
-             if (q == (const Quantum *) NULL)
+             if (q == (Quantum *) NULL)
                break;
 
              for (x=0; x < (ssize_t) image->columns; x++)
diff --git a/coders/pnm.c b/coders/pnm.c
index 484114c25..767d757a8 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -437,7 +437,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -548,7 +548,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -636,7 +636,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (count != (ssize_t) extent)
             status=MagickFalse;
           q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             {
               status=MagickFalse;
               continue;
@@ -712,7 +712,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (count != (ssize_t) extent)
             status=MagickFalse;
           q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             {
               status=MagickFalse;
               continue;
@@ -820,7 +820,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (count != (ssize_t) extent)
             status=MagickFalse;
           q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             {
               status=MagickFalse;
               continue;
@@ -996,7 +996,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           if (count != (ssize_t) extent)
             status=MagickFalse;
           q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             {
               status=MagickFalse;
               continue;
@@ -1226,7 +1226,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             status=MagickFalse;
           q=QueueAuthenticPixels(image,0,(ssize_t) (image->rows-offset-1),
             image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             {
               status=MagickFalse;
               continue;
diff --git a/coders/psd.c b/coders/psd.c
index a23f23ae9..a0ad522e5 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -619,7 +619,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
           break;
       }
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     p=pixels;
     for (x=0; x < (ssize_t) image->columns; x++)
@@ -1310,7 +1310,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 {
                   q=GetAuthenticPixels(layer_info[i].image,0,y,
                     layer_info[i].image->columns,1,exception);
-                  if (q == (const Quantum *) NULL)
+                  if (q == (Quantum *) NULL)
                     break;
                   for (x=0; x < (ssize_t) layer_info[i].image->columns; x++)
                   {
diff --git a/coders/raw.c b/coders/raw.c
index 47121dfa8..e726329af 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -205,7 +205,7 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
           break;
         }
       q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,quantum_info,
         quantum_type,pixels,exception);
diff --git a/coders/rgb.c b/coders/rgb.c
index 5e02d4e2a..78faec997 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -234,7 +234,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,quantum_type,pixels,exception);
@@ -248,7 +248,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -318,7 +318,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             quantum_type=quantum_types[i];
             q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
               exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
               quantum_info,quantum_type,pixels,exception);
@@ -332,7 +332,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                   image->columns,1,exception);
                 if ((p == (const Quantum *) NULL) ||
-                    (q == (const Quantum *) NULL))
+                    (q == (Quantum *) NULL))
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
@@ -413,7 +413,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -427,7 +427,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -465,7 +465,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -479,7 +479,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -518,7 +518,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -532,7 +532,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -579,7 +579,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,AlphaQuantum,pixels,exception);
@@ -594,7 +594,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
@@ -668,7 +668,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -682,7 +682,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -739,7 +739,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -753,7 +753,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -811,7 +811,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -825,7 +825,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -885,7 +885,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,BlueQuantum,pixels,exception);
@@ -899,7 +899,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
diff --git a/coders/rla.c b/coders/rla.c
index c1f3b2b87..a9645a26c 100644
--- a/coders/rla.c
+++ b/coders/rla.c
@@ -297,7 +297,7 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               q=GetAuthenticPixels(image,(ssize_t) (x % image->columns),
                 (ssize_t) (y % image->rows),1,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               byte=(unsigned char) ReadBlobByte(image);
               length--;
@@ -339,7 +339,7 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           q=GetAuthenticPixels(image,(ssize_t) (x % image->columns),
             (ssize_t) (y % image->rows),1,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           switch (channel)
           {
diff --git a/coders/rle.c b/coders/rle.c
index c2fecd991..a3b762799 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -438,7 +438,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -498,7 +498,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (y=0; y < (ssize_t) image->rows; y++)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -525,7 +525,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
             for (y=0; y < (ssize_t) image->rows; y++)
             {
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
diff --git a/coders/sct.c b/coders/sct.c
index ad2f66e6b..d33c9377f 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -229,7 +229,7 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     for (i=0; i < (ssize_t) separations; i++)
     {
       q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
diff --git a/coders/sgi.c b/coders/sgi.c
index e8145abc4..11e55f4d0 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -547,7 +547,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               p=iris_pixels+(image->rows-y-1)*8*image->columns;
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -580,7 +580,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             p=iris_pixels+(image->rows-y-1)*4*image->columns;
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
@@ -620,7 +620,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
             {
               p=iris_pixels+(image->rows-y-1)*8*image->columns;
               q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -646,7 +646,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
           {
             p=iris_pixels+(image->rows-y-1)*4*image->columns;
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/stegano.c b/coders/stegano.c
index 2e9ffb110..71ba93056 100644
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -186,7 +186,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
         (void) GetOneVirtualPixel(watermark,k % (ssize_t) watermark->columns,
           k/(ssize_t) watermark->columns,&pixel,exception);
         q=GetAuthenticPixels(image,x,y,1,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         switch (c)
         {
diff --git a/coders/sun.c b/coders/sun.c
index 7ca39d870..752cdffde 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -441,7 +441,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
       for (y=0; y < (ssize_t) image->rows; y++)
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
@@ -484,7 +484,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
@@ -521,7 +521,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/svg.c b/coders/svg.c
index 8a542056a..209221bda 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2912,7 +2912,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/tga.c b/coders/tga.c
index 6789dfd79..e183e4a18 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -354,7 +354,7 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (((unsigned char) (tga_info.attributes & 0x20) >> 5) == 0)
       real=image->rows-real-1;
     q=QueueAuthenticPixels(image,0,(ssize_t) real,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/tiff.c b/coders/tiff.c
index 3c89fa6ca..a6b53dba0 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1242,7 +1242,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           if (status == -1)
             break;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
             quantum_type,pixels,exception);
@@ -1300,7 +1300,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           if (status == -1)
             break;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
             quantum_type,pixels,exception);
@@ -1336,7 +1336,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             if (status == -1)
               break;
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             if (image->colorspace != CMYKColorspace)
               switch (i)
@@ -1391,7 +1391,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           if (i == 0)
             {
@@ -1579,7 +1579,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           q+=GetPixelChannels(image)*(image->columns-1);
           for (x=0; x < (ssize_t) image->columns; x++)
diff --git a/coders/tim.c b/coders/tim.c
index d68a94704..bd265c3db 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -256,7 +256,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=(ssize_t) image->rows-1; y >= 0; y--)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           p=tim_pixels+y*bytes_per_line;
           for (x=0; x < ((ssize_t) image->columns-1); x+=2)
@@ -293,7 +293,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=(ssize_t) image->rows-1; y >= 0; y--)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           p=tim_pixels+y*bytes_per_line;
           for (x=0; x < (ssize_t) image->columns; x++)
@@ -322,7 +322,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=tim_pixels+y*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -357,7 +357,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         {
           p=tim_pixels+y*bytes_per_line;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
diff --git a/coders/txt.c b/coders/txt.c
index e7e4b8e8e..0b74fe6dc 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -471,7 +471,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (count < 5)
           continue;
         q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           continue;
         SetPixelRed(image,ScaleAnyToQuantum(pixel.red,range),q);
         SetPixelGreen(image,ScaleAnyToQuantum(pixel.green,range),q);
diff --git a/coders/uil.c b/coders/uil.c
index ec5cf7755..795979bcf 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -268,7 +268,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/uyvy.c b/coders/uyvy.c
index 5b46dd475..03724ecda 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -151,7 +151,7 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) (image->columns >> 1); x++)
     {
diff --git a/coders/vicar.c b/coders/vicar.c
index 9bfc72f24..840be5de2 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -299,7 +299,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     count=ReadBlob(image,length,pixels);
     (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
diff --git a/coders/viff.c b/coders/viff.c
index 28ea7f966..2ab7f99b0 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -620,7 +620,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) (image->columns-7); x+=8)
           {
@@ -664,7 +664,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -690,7 +690,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
diff --git a/coders/wbmp.c b/coders/wbmp.c
index 3a2557dcd..e637dfd31 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -187,7 +187,7 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     bit=0;
     byte=0;
diff --git a/coders/webp.c b/coders/webp.c
index 57b07a2c4..49f81a12b 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -167,7 +167,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/wpg.c b/coders/wpg.c
index 48587e0fe..4370e1057 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -286,7 +286,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
     case 1:  /* Convert bitmap scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-7); x+=8)
         {
@@ -317,7 +317,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
     case 2:  /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
         {
@@ -371,7 +371,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
     case 4:  /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < ((ssize_t) image->columns-1); x+=2)
           { 
@@ -400,7 +400,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
     case 8: /* Convert PseudoColor scanline. */
       {
         q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-        if (q == (const Quantum *) NULL) break;
+        if (q == (Quantum *) NULL) break;
 
         for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -417,7 +417,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp)
      
     case 24:     /*  Convert DirectColor scanline.  */
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-      if (q == (const Quantum *) NULL)
+      if (q == (Quantum *) NULL)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
         {
diff --git a/coders/xbm.c b/coders/xbm.c
index 39c791cb5..1d192fbf1 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -353,7 +353,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     bit=0;
     byte=0;
diff --git a/coders/xc.c b/coders/xc.c
index 82a6483d0..4e259700b 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -140,7 +140,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
diff --git a/coders/xcf.c b/coders/xcf.c
index 26bc193f0..fa3e2e7b4 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -369,7 +369,7 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image,
   for (y=0; y < (ssize_t) tile_image->rows; y++)
   {
     q=QueueAuthenticPixels(tile_image,0,y,tile_image->columns,1,exception);
-    if (q == (const Quantum *) NULL)
+    if (q == (Quantum *) NULL)
       break;
     if (inDocInfo->image_type == GIMP_GRAY)
       {
diff --git a/coders/xpm.c b/coders/xpm.c
index 9c619d94e..959f02fb1 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -673,7 +673,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
           for (y=0; y < (ssize_t) picon->rows; y++)
           {
             q=GetAuthenticPixels(picon,0,y,picon->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) picon->columns; x++)
             {
@@ -700,7 +700,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
       for (y=0; y < (ssize_t) picon->rows; y++)
       {
         q=GetAuthenticPixels(picon,0,y,picon->columns,1,exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) picon->columns; x++)
         {
diff --git a/coders/xwd.c b/coders/xwd.c
index b7ae3e583..2535fb459 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -398,7 +398,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
@@ -425,7 +425,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (ssize_t) image->rows; y++)
           {
             q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             for (x=0; x < (ssize_t) image->columns; x++)
             {
@@ -469,7 +469,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (ssize_t) image->rows; y++)
         {
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index ad721e2f4..b0fa64f37 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -226,7 +226,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,quantum_type,pixels,exception);
@@ -240,7 +240,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -298,7 +298,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             quantum_type=quantum_types[i];
             q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
               exception);
-            if (q == (const Quantum *) NULL)
+            if (q == (Quantum *) NULL)
               break;
             length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
               quantum_info,quantum_type,pixels,exception);
@@ -312,7 +312,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                   image->columns,1,exception);
                 if ((p == (const Quantum *) NULL) ||
-                    (q == (const Quantum *) NULL))
+                    (q == (Quantum *) NULL))
                   break;
                 for (x=0; x < (ssize_t) image->columns; x++)
                 {
@@ -379,7 +379,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -393,7 +393,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -422,7 +422,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -436,7 +436,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -465,7 +465,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -479,7 +479,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -510,7 +510,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,AlphaQuantum,pixels,exception);
@@ -525,7 +525,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
@@ -589,7 +589,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,RedQuantum,pixels,exception);
@@ -603,7 +603,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -651,7 +651,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,GreenQuantum,pixels,exception);
@@ -665,7 +665,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -713,7 +713,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
             }
           q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
             quantum_info,BlueQuantum,pixels,exception);
@@ -727,7 +727,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
               q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                 image->columns,1,exception);
               if ((p == (const Quantum *) NULL) ||
-                  (q == (const Quantum *) NULL))
+                  (q == (Quantum *) NULL))
                 break;
               for (x=0; x < (ssize_t) image->columns; x++)
               {
@@ -777,7 +777,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                 }
               q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
                 exception);
-              if (q == (const Quantum *) NULL)
+              if (q == (Quantum *) NULL)
                 break;
               length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
                 quantum_info,BlueQuantum,pixels,exception);
@@ -792,7 +792,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
                   q=GetAuthenticPixels(image,0,y-image->extract_info.y,
                     image->columns,1,exception);
                   if ((p == (const Quantum *) NULL) ||
-                      (q == (const Quantum *) NULL))
+                      (q == (Quantum *) NULL))
                     break;
                   for (x=0; x < (ssize_t) image->columns; x++)
                   {
diff --git a/coders/yuv.c b/coders/yuv.c
index 554cea5f9..563ed24b1 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -231,7 +231,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
             count=ReadBlob(image,(size_t) (2*quantum*image->columns),scanline);
           p=scanline;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           chroma_pixels=QueueAuthenticPixels(chroma_image,0,y,
             chroma_image->columns,1,exception);
@@ -285,7 +285,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
             count=ReadBlob(image,(size_t) quantum*image->columns,scanline);
           p=scanline;
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) image->columns; x++)
           {
@@ -333,7 +333,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
           p=scanline;
           q=QueueAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
             exception);
-          if (q == (const Quantum *) NULL)
+          if (q == (Quantum *) NULL)
             break;
           for (x=0; x < (ssize_t) chroma_image->columns; x++)
           {
@@ -369,7 +369,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
         p=scanline;
         q=GetAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
           exception);
-        if (q == (const Quantum *) NULL)
+        if (q == (Quantum *) NULL)
           break;
         for (x=0; x < (ssize_t) chroma_image->columns; x++)
         {
@@ -400,7 +400,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception)
       q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
       chroma_pixels=GetVirtualPixels(resize_image,0,y,resize_image->columns,1,
         &resize_image->exception);
-      if ((q == (const Quantum *) NULL) ||
+      if ((q == (Quantum *) NULL) ||
           (chroma_pixels == (const Quantum *) NULL))
         break;
       for (x=0; x < (ssize_t) image->columns; x++)