From: glennrp <glennrp@git.imagemagick.org>
Date: Wed, 23 Apr 2014 00:34:09 +0000 (+0000)
Subject: Fixed other cases (PNG48, PNG64) that did not work with PNG00.
X-Git-Tag: 7.0.1-0~2424
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a4989dda1dc69f5b48487088bcc68b78fc4f322;p=imagemagick

Fixed other cases (PNG48, PNG64) that did not work with PNG00.
---

diff --git a/coders/png.c b/coders/png.c
index a3f7af494..a0cb513cb 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -11637,8 +11637,10 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   mng_info->write_png64=LocaleCompare(image_info->magick,"PNG64") == 0;
 
   value=GetImageOption(image_info,"png:format");
+  if (value == (char *) NULL)
+    if (LocaleCompare(image_info->magick,"PNG00") == 0)
 
-  if (value != (char *) NULL)
+  if (value != (char *) NULL || LocaleCompare(image_info->magick,"PNG00") == 0)
     {
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
          "  Format=%s",value);
@@ -11664,7 +11666,8 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       else if (LocaleCompare(value,"png64") == 0)
         mng_info->write_png64 = MagickTrue;
 
-      else if (LocaleCompare(value,"png00") == 0)
+      else if ((LocaleCompare(value,"png00") == 0) ||
+         LocaleCompare(image_info->magick,"PNG00") == 0)
         {
           /* Retrieve png:IHDR.bit-depth-orig and png:IHDR.color-type-orig. */
           value=GetImageProperty(image,"png:IHDR.bit-depth-orig",exception);
@@ -11677,10 +11680,10 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
               if (LocaleCompare(value,"1") == 0)
                 mng_info->write_png_depth = 1;
     
-              else if (LocaleCompare(value,"1") == 0)
+              else if (LocaleCompare(value,"2") == 0)
                 mng_info->write_png_depth = 2;
     
-              else if (LocaleCompare(value,"2") == 0)
+              else if (LocaleCompare(value,"4") == 0)
                 mng_info->write_png_depth = 4;
     
               else if (LocaleCompare(value,"8") == 0)