]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <mikayla-grace@urban-warrior.org>
Sat, 9 Feb 2019 23:05:18 +0000 (18:05 -0500)
committerCristy <mikayla-grace@urban-warrior.org>
Sat, 9 Feb 2019 23:05:18 +0000 (18:05 -0500)
coders/wpg.c
configure

index 895f1d82c31fb7fc6bc5fc5cb0b192915b5e777d..f2c024afb7511eed99df060e8841b4f3e85335e5 100644 (file)
@@ -1159,7 +1159,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
               if (WPG_Palette.StartIndex > WPG_Palette.NumOfEntries)
                 ThrowReaderException(CorruptImageError,"InvalidColormapIndex");
               image->colors=WPG_Palette.NumOfEntries;
-              if (!AcquireImageColormap(image,image->colors,exception))
+              if (AcquireImageColormap(image,image->colors,exception) == MagickFalse)
                 goto NoMemory;
               for (i=WPG_Palette.StartIndex;
                    i < (int)WPG_Palette.NumOfEntries; i++)
@@ -1245,9 +1245,8 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
                 {
                   if (bpp < 24)
                     if ( (image->colors < (one << bpp)) && (bpp != 24) )
-                      image->colormap=(PixelInfo *) ResizeQuantumMemory(
-                        image->colormap,(size_t) (one << bpp),
-                        sizeof(*image->colormap));
+                      if (AcquireImageColormap(image,one << bpp,exception) == MagickFalse)
+                        goto NoMemory;
                 }
 
               if ((bpp == 1) && (image->colors > 1))
index 54edee2d7f507dde3b9ae05cb4c1cc6915828b2e..0f937c792406a1ac1eca4352bd5504766f44a5c9 100755 (executable)
--- a/configure
+++ b/configure
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=28
 
 MAGICK_VERSION=7.0.8-28
 
-MAGICK_GIT_REVISION=15314:4bffda6:20190209
+MAGICK_GIT_REVISION=15319:51dd231d7:20190209
 
 
 # Substitute library versioning