From 8de49d092129ccedc3aaab9139c730c04b395a2f Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Thu, 27 Sep 2012 09:26:49 -0500
Subject: [PATCH] [libpng16] Marked the broken (bad white point) original HP
 sRGB profiles

correctly and correct comments.
---
 ANNOUNCE |  8 +++++---
 CHANGES  |  6 ++++--
 png.c    | 15 +++++++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 3dc750f9c..9f789f383 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta30 - September 6, 2012
+Libpng 1.6.0beta30 - September 27, 2012
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -504,7 +504,7 @@ Version 1.6.0beta29 [September 4, 2012]
     part plus guessing a gAMA value requires code to pass selected RGB values
     through the profile.
 
-Version 1.6.0beta30 [September 6, 2012]
+Version 1.6.0beta30 [September 27, 2012]
   Changed ICC profile matrix/vector types to not depend on array type rules.
     By the ANSI-C standard the new types should be identical to the previous
     versions, and all known versions of gcc tested with the previous versions
@@ -514,7 +514,9 @@ Version 1.6.0beta30 [September 6, 2012]
     elements of the png_icc_matrix and png_icc_vector types. The accidental
     (harmless) 'const' previously applied to the parameters of two of the
     functions have also been removed.
-  Added a work around for GCC 4.2 optimiztion bug
+  Added a work around for GCC 4.2 optimization bug.
+  Marked the broken (bad white point) original HP sRGB profiles correctly and
+    correct comments.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index acda69e33..2a403d4f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4256,7 +4256,7 @@ Version 1.6.0beta29 [September 4, 2012]
     part plus guessing a gAMA value requires code to pass selected RGB values
     through the profile.
 
-Version 1.6.0beta30 [September 6, 2012]
+Version 1.6.0beta30 [September 27, 2012]
   Changed ICC profile matrix/vector types to not depend on array type rules.
     By the ANSI-C standard the new types should be identical to the previous
     versions, and all known versions of gcc tested with the previous versions
@@ -4266,7 +4266,9 @@ Version 1.6.0beta30 [September 6, 2012]
     elements of the png_icc_matrix and png_icc_vector types. The accidental
     (harmless) 'const' previously applied to the parameters of two of the
     functions have also been removed.
-  Added a work around for GCC 4.2 optimiztion bug
+  Added a work around for GCC 4.2 optimization bug.
+  Marked the broken (bad white point) original HP sRGB profiles correctly and
+    correct comments.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.c b/png.c
index ebdc5d8a8..5dd470168 100644
--- a/png.c
+++ b/png.c
@@ -1,4 +1,4 @@
- 
+
 /* png.c - location for general purpose libpng functions
  *
  * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
@@ -749,13 +749,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.0beta30 - September 6, 2012" PNG_STRING_NEWLINE \
+     "libpng version 1.6.0beta30 - September 27, 2012" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2012 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.0beta30 - September 6, 2012\
+      return "libpng version 1.6.0beta30 - September 27, 2012\
       Copyright (c) 1998-2012 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -3386,14 +3386,17 @@ static const struct
 
    /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
     * match the D50 PCS illuminant in the header (it is in fact the D65 values,
-    * so the white point is recorded as 
+    * so the white point is recorded as the un-adapted value.)  The profiles
+    * below only differ in one byte - the intent - and are basically the same as
+    * the previous profile except for the mediaWhitePointTag error and a missing
+    * chromaticAdaptationTag.
     */
    PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
-      "1998/02/09 06:49:00", 3144, "sRGB Profile.icc")
+      "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
 
    PNG_ICC_CHECKSUM(0x0398f3fcUL, 0xf29e526dUL,
-      PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
+      PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
 };