From eb67f8bcb12e0b351d60183e27639a3f4bc403c9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 2 Jan 2015 09:13:35 -0600 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta46.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 4 ++++ libpng.3 | 4 ++++ libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 13 files changed, 25 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 59f4f2721..8d730513f 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 1, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 2, 2015, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 1, 2015 +January 2, 2015 diff --git a/README b/README index fa79bc355..c443e7da7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta46 - January 1, 2015 (shared library 17.0) +README for libpng version 1.7.0beta46 - January 2, 2015 (shared library 17.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/libpng-manual.txt b/libpng-manual.txt index fb5ab501f..7166433cb 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -5147,6 +5147,10 @@ semicolon in your definition, e.g., # endif #endif +The png_get_IHDR() function now allows users to supply NULL for any +argument in which they aren't interested. Previously, the width, height, +bit_depth, and color_type arguments were not allowed to be NULL. + The 8-bit compose and rgb_to_grayscale operations were made more accurate. While these did not introduce API incompatibility, there may be differences in unit test results. diff --git a/libpng.3 b/libpng.3 index a0eb43a7b..7ae67222a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -5641,6 +5641,10 @@ semicolon in your definition, e.g., # endif #endif +The png_get_IHDR() function now allows users to supply NULL for any +argument in which they aren't interested. Previously, the width, height, +bit_depth, and color_type arguments were not allowed to be NULL. + The 8-bit compose and rgb_to_grayscale operations were made more accurate. While these did not introduce API incompatibility, there may be differences in unit test results. diff --git a/libpngpf.3 b/libpngpf.3 index 9c7350221..d873a7957 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 1, 2015" +.TH LIBPNGPF 3 "January 2, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta46 (private functions) diff --git a/png.5 b/png.5 index c569e9e9b..41b64adc5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 1, 2015" +.TH PNG 5 "January 2, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9599d6b55..c84b4ef4c 100644 --- a/png.c +++ b/png.c @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta46 - January 1, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta46 - January 2, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.7.0beta46 - January 1, 2015\ + return "libpng version 1.7.0beta46 - January 2, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index db1b3bed4..5da37292c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta46 - January 1, 2015 + * libpng version 1.7.0beta46 - January 2, 2015 * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta46 - January 1, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta46 - January 2, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 1, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 2, 2015, are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * January 1, 2015 + * January 2, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -382,7 +382,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta46" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta46 - January 1, 2015\n" + " libpng version 1.7.0beta46 - January 2, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 136d40144..d713cd0e1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta46 - January 1, 2015 + * libpng version 1.7.0beta46 - January 2, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 7be3a9549..c69cf42e9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta46 - January 1, 2015 +libpng version 1.7.0beta46 - January 2, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 21e34c2f3..2b3ce779b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@