]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Mon, 24 Apr 2017 16:14:00 +0000 (12:14 -0400)
committerCristy <urban-warrior@imagemagick.org>
Mon, 24 Apr 2017 16:14:00 +0000 (12:14 -0400)
MagickCore/cache.c

index 21a27c5e16503a15f0c70522116a170182ba3213..d27e714d52fa60af2d0e62a6b1bf4105fd76964b 100644 (file)
@@ -2723,7 +2723,7 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image,
         case BlackVirtualPixelMethod:
         {
           for (i=0; i < (ssize_t) cache_info->number_channels; i++)
-            SetPixelChannel(image,(PixelChannel) i,0,virtual_pixel);
+            SetPixelChannel(image,(PixelChannel) i,(Quantum) 0,virtual_pixel);
           SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
           break;
         }
@@ -2738,7 +2738,7 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image,
         case TransparentVirtualPixelMethod:
         {
           for (i=0; i < (ssize_t) cache_info->number_channels; i++)
-            SetPixelChannel(image,(PixelChannel) i,0,virtual_pixel);
+            SetPixelChannel(image,(PixelChannel) i,(Quantum) 0,virtual_pixel);
           SetPixelAlpha(image,TransparentAlpha,virtual_pixel);
           break;
         }
@@ -4719,7 +4719,8 @@ static inline MagickBooleanType AcquireCacheNexusPixels(
       nexus_info->cache=(Quantum *) MagickAssumeAligned(AcquireAlignedMemory(1,
         (size_t) nexus_info->length));
       if (nexus_info->cache != (Quantum *) NULL)
-        ResetMagickMemory(nexus_info->cache,0,(size_t) nexus_info->length);
+        (void) ResetMagickMemory(nexus_info->cache,0,(size_t)
+          nexus_info->length);
     }
   else
     {