[devel] Fix more inconsistencies from the swap of 16_TO_8 APIs.

pngvalid still fails.

1 files changed, 9 insertions, 6 deletions

diff --git a/pngread.c b/pngread.c
index e200705f0..b11f4db0f 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1289,18 +1289,21 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
 #ifdef PNG_READ_16_TO_8_SUPPORTED
    /* Tell libpng to strip 16-bit/color files down to 8 bits per color.
     */
-#  ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#  ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
    if (transforms & PNG_TRANSFORM_SCALE_16)
       png_set_scale_16(png_ptr);
+#    ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
+   else
+
+#    endif
 #  endif
 #  ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-  /* Added at libpng-1.5.4. "strip_16" produces the same result that it
-   * did in earlier versions, while "scale_16" is now more accurate.
-   */
-   else
+     /* Added at libpng-1.5.4. "strip_16" produces the same result that it
+      * did in earlier versions, while "scale_16" is now more accurate.
+      */
      if (transforms & PNG_TRANSFORM_STRIP_16)
         png_set_strip_16(png_ptr);
-#endif
+#  endif
 #endif
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED