From 2d99978f67d69046fd21c8b99ef292f43d6653d3 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 15 Feb 2013 23:25:18 -0600 Subject: [PATCH] [libpng16] Made sRGB check numbers consistent. --- ANNOUNCE | 1 + CHANGES | 1 + png.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ecfd741d1..4ffb57125 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -29,6 +29,7 @@ Version 1.6.1 [February 16, 2013] Made symbol prefixing work with the ARM neon optimizations. Also allow pngpriv.h to be included for preprocessor definitions only, so it can be used in non-C/C++ files. Back ported from libpng 1.7. + Made sRGB check numbers consistent. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2267c9693..6a6f72478 100644 --- a/CHANGES +++ b/CHANGES @@ -4385,6 +4385,7 @@ Version 1.6.1 [February 16, 2013] Made symbol prefixing work with the ARM neon optimizations. Also allow pngpriv.h to be included for preprocessor definitions only, so it can be used in non-C/C++ files. Back ported from libpng 1.7. + Made sRGB check numbers consistent. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.c b/png.c index 75423e60e..076947295 100644 --- a/png.c +++ b/png.c @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.1beta01 - February 14, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.1beta01 - February 16, 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.1beta01 - February 14, 2013\ + return "libpng version 1.6.1beta01 - February 16, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -2127,7 +2127,7 @@ static const struct PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/, "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual") - PNG_ICC_CHECKSUM(0x0398f3fcUL, 0xf29e526dUL, + PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d, PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/, "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative") };