(no commit message)

diff --git a/coders/png.c b/coders/png.c
index ef561dffd3d66fcfa31a65ace31098a7f0200947..1ff254fcf17e5eed8c840af8f0ae447cc4c94de0 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7517,7 +7517,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
   rowbytes=image->columns;
   if (image_depth > 8)
     rowbytes*=2;
-  switch (mng_info->write_png_colortype-1)
+  switch (ping_color_type)
     {
       case PNG_COLOR_TYPE_RGB:
         rowbytes*=3;

diff --git a/config/francais.xml b/config/francais.xml
index 950b6448187dc658521d8b626a94c7288034dd5a..9951c9e8df4ee34571cd23e305f96cf4cc4f15c3 100644 (file)
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -822,7 +822,7 @@
         <message name="MissingAnImageFilename">
           nom de fichier d'image absent
         </message>
-        <message name="TruncatedFilename">
+        <message name="FilenameTruncated">
           image filename truncated
         </message>
         <message name="UnrecognizedColormapType">