]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31438
authorCristy <urban-warrior@imagemagick.org>
Tue, 21 Feb 2017 17:29:58 +0000 (12:29 -0500)
committerCristy <urban-warrior@imagemagick.org>
Tue, 21 Feb 2017 17:29:58 +0000 (12:29 -0500)
MagickCore/colormap.c
coders/mpc.c

index 893c655928d732be790f2c8737c56f3a318fbb68..b9e639b49bd55fb04236ef23d415f3f602dd62ca 100644 (file)
@@ -128,6 +128,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
+  image->storage_class=PseudoClass;
   for (i=0; i < (ssize_t) image->colors; i++)
   {
     double
@@ -141,7 +142,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image,
     image->colormap[i].blue=pixel;
     image->colormap[i].alpha=OpaqueAlpha;
   }
-  return(SetImageStorageClass(image,PseudoClass,exception));
+  return(MagickTrue);
 }
 \f
 /*
index 3a85d5597fee827c9740a7737b74f5c2550e5d4f..6fd18486bbb17a1030713c8b72362355d403140d 100644 (file)
@@ -850,9 +850,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
         /*
           Create image colormap.
         */
-        image->colormap=(PixelInfo *) AcquireQuantumMemory(image->colors+1,
-          sizeof(*image->colormap));
-        if (image->colormap == (PixelInfo *) NULL)
+        if (AcquireImageColormap(image,image->colors) == MagickFalse)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
         if (image->colors != 0)
           {