Warn if PNG colortype and bitdepth on "-define" directive can't be met encoder.

diff --git a/ChangeLog b/ChangeLog
index 40c2005da880eb34f86a6cbdb055d059986ee730..80cbfefca5e59a3126493ac9ea63fb11c6c3da38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-10  6.6.3-5 Glenn Randers-Pehrson <glennrp@image...>
+  * Emit a warning if the PNG encoder can't satisfy the color type and
+    bit depth requested with a "-define" directive.
+
 2010-08-07  6.6.3-4 Cristy  <quetzlzacatenango@image...>
   * The orient option sometimes improperly set "undefined" (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16795).

diff --git a/coders/png.c b/coders/png.c
index 6ca8fb2ab073e612b976e3799d747a89965f459b..7e8be2c0a1ac5c08cc744596d74006d893c712c1 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7639,7 +7639,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
                   ping_color_type);
             }
         }
-      if (0) png_error(ping,
+      png_warning(ping,
         "Cannot write image with defined PNG:bit-depth or PNG:color-type.");
     }