commit aee83b43d6ffbd93f0cb8868487d10fd4f1bcf89
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Jun 18 00:19:54 2011 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Jun 18 00:19:54 2011 -0500
tree ec572b0efaebfdeea31ca12d3e311e150d5d3435
parent 9a1e2232baa20c2c24a8f4556e5891cdad5891df

[devel] Fixed buffer bug (both the strip_16 and scale_16 transforms were

being applied.

pngrtran.c

diff --git a/pngrtran.c b/pngrtran.c
index 0fca5dd..e4ed0b9 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1873,23 +1873,24 @@
 #endif
 
 #ifdef PNG_READ_16_TO_8_SUPPORTED
-#ifdef PNG_READ_16BIT_SUPPORTED
+#  ifdef PNG_READ_16BIT_SUPPORTED
    if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) &&
        (info_ptr->bit_depth == 16))
       info_ptr->bit_depth = 8;
-#else
+#  else
+
    /* Force chopping 16-bit input down to 8 */
    if (info_ptr->bit_depth == 16)
    {
-      if (!(png_ptr->transformations & PNG_SCALE_16_TO_8))
-#if PNG_READ_STRIP_16_TO_8_SUPPORTED
+      if (!(png_ptr->transformations & PNG_16_TO_8))
+#    if PNG_READ_STRIP_16_TO_8_SUPPORTED
         png_ptr->transformations |=PNG_16_TO_8;
-#else
+#    else
         png_ptr->transformations |=PNG_SCALE_16_TO_8;
-#endif
+#    endif
       info_ptr->bit_depth = 8;
    }
-#endif
+#  endif
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
@@ -2151,7 +2152,7 @@
 #endif
 
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-   if (png_ptr->transformations & PNG_16_TO_8)
+   if (png_ptr->transformations & PNG_SCALE_16_TO_8)
       png_do_scale_16_to_8(&(png_ptr->row_info), png_ptr->row_buf + 1);
 #endif
 #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED