commit e4413a735bd7e9dfbe73b30b89a9b348f6c136fc
author John Bowler <jbowler@acm.org> Wed Apr 17 21:27:47 2013 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed Apr 17 21:27:47 2013 -0500
tree bd4d6fe91cb1daac21e55cf958222eb7054ea022
parent 7fdb594e73746dcea3a11953da361466bbb1d4dc

[libpng16] Disallow storing sRGB information when the sRGB is not supported.

Reverted previous attempt to allow gAMA and sRGB non-support with the
simplified API.

png.c

diff --git a/png.c b/png.c
index a894ac5..330fc2b 100644
--- a/png.c
+++ b/png.c
@@ -768,13 +768,13 @@
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.2beta02 - April 14, 2013" PNG_STRING_NEWLINE \
+     "libpng version 1.6.2beta02 - April 18, 2013" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.6.2beta02 - April 14, 2013\
+      return "libpng version 1.6.2beta02 - April 18, 2013\
       Copyright (c) 1998-2013 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -2275,7 +2275,10 @@
       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
          profile))
    {
-      png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
+#     ifdef PNG_sRGB_SUPPORTED
+         /* If no sRGB support, don't try storing sRGB information */
+         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
+#     endif
       return 1;
    }