commit 4b7635ce727a8826be8b102214aec85b5456f8cf
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Sep 23 14:53:44 2017 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Sep 23 15:11:18 2017 -0500
tree 34f90ae1091b24c3920785417cc1679d8462afa9
parent 96333b6bea59dd8d0659e46ec9426119d3fe5753
parent 95046512a4f7b63b78f8dcfee6462f375f129b44

[libpng16] Support associated alpha in the simplified api

png.h

diff --git a/png.h b/png.h
index 81f6110..7697c3c 100644
--- a/png.h
+++ b/png.h
@@ -2819,6 +2819,8 @@
 #  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
 #endif
 
+#define PNG_FORMAT_FLAG_ASSOCIATED_ALPHA 0x40U /* alpha channel is associated */
+
 /* Commonly used formats have predefined macros.
  *
  * First the single byte (sRGB) formats:

pngread.c

diff --git a/pngread.c b/pngread.c
index e34ddd9..6b94413 100644
--- a/pngread.c
+++ b/pngread.c
@@ -3759,7 +3759,13 @@
          mode = PNG_ALPHA_PNG;
          output_gamma = PNG_DEFAULT_sRGB;
       }
-
+      
+      if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0)
+      {
+         mode = PNG_ALPHA_OPTIMIZED;
+         change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;
+      }
+      
       /* If 'do_local_background' is set check for the presence of gamma
        * correction; this is part of the work-round for the libpng bug
        * described above.
@@ -3985,6 +3991,10 @@
       else if (do_local_compose != 0) /* internal error */
          png_error(png_ptr, "png_image_read: alpha channel lost");
 
+      if ((format & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) {
+         info_format |= PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;
+      }
+
       if (info_ptr->bit_depth == 16)
          info_format |= PNG_FORMAT_FLAG_LINEAR;