]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/340
authorCristy <urban-warrior@imagemagick.org>
Tue, 3 Jan 2017 00:10:34 +0000 (19:10 -0500)
committerCristy <urban-warrior@imagemagick.org>
Tue, 3 Jan 2017 00:11:38 +0000 (19:11 -0500)
MagickCore/image.c
coders/png.c

index e6796b7dbbb2aa1ffc27eb7d3969e0b996a0f771..6cf47ce13eb72eceb820212d2ddea461596b0181 100644 (file)
@@ -3678,9 +3678,9 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception)
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(image->signature == MagickCoreSignature);
-  if ((image->storage_class != PseudoClass) ||
-      (image->colormap == (PixelInfo *) NULL))
+  if (image->storage_class != PseudoClass)
     return(MagickFalse);
+  assert(image->colormap != (PixelInfo *) NULL);
   range_exception=MagickFalse;
   status=MagickTrue;
   taint=image->taint;
index 8661ca8681c06fb5728b0afeeb3d8a445db9773f..23bdb54bc17c1c1c75607c688630992a78b6aa44 100644 (file)
@@ -2996,8 +2996,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
         }
     }
 
-  if ((image->storage_class == PseudoClass) &&
-      (image_info->ping == MagickFalse))
+  if (image->storage_class == PseudoClass)
     {
       /*
         Initialize image colormap.