diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-04-29 20:55:55 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-04-29 21:32:12 -0500 |
commit | 40d41fe6f8a0dac0b9ea4ae36cc5217a49eda2a1 (patch) | |
tree | 160b94601eb4ffc7d793fe66a728196c568b1879 | |
parent | 7073d26e5199ec9cbdb4e652523b3b37398f1587 (diff) | |
download | libpng-40d41fe6f8a0dac0b9ea4ae36cc5217a49eda2a1.tar.gz |
[libpng17] Imported from libpng-1.7.0beta12.tarv1.7.0beta12
-rw-r--r-- | ANNOUNCE | 4 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | arm/arm_init.c | 2 | ||||
-rw-r--r-- | arm/filter_neon.S | 2 | ||||
-rw-r--r-- | libpng-manual.txt | 6 | ||||
-rw-r--r-- | libpng.3 | 14 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 4 | ||||
-rw-r--r-- | png.h | 10 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngset.c | 6 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 2 |
18 files changed, 36 insertions, 34 deletions
@@ -1,5 +1,5 @@ -Libpng 1.7.0beta12 - April 29, 2013 +Libpng 1.7.0beta12 - April 30, 2013 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. @@ -268,7 +268,7 @@ Version 1.7.0beta10 [April 24, 2013] Version 1.7.0beta11 [April 26, 2013] Test for 'arm*', not just 'arm' in the host_cpu configure variable. -Version 1.7.0beta12 [April 29, 2013] +Version 1.7.0beta12 [April 30, 2013] Added png_app_warning for out-of-range unknown chunk index in png_set_unknown_chunk_location(). Expanded manual paragraph about writing private chunks. @@ -4556,7 +4556,7 @@ Version 1.7.0beta10 [April 24, 2013] Version 1.7.0beta11 [April 26, 2013] Test for 'arm*', not just 'arm' in the host_cpu configure variable. -Version 1.7.0beta12 [April 29, 2013] +Version 1.7.0beta12 [April 30, 2013] Added png_app_warning for out-of-range unknown chunk index in png_set_unknown_chunk_location(). Expanded manual paragraph about writing private chunks. @@ -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.0beta12, April 26, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta12, April 30, 2013, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 26, 2013 +April 30, 2013 @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta12 - April 26, 2013 (shared library 17.0) +README for libpng version 1.7.0beta12 - April 30, 2013 (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/arm/arm_init.c b/arm/arm_init.c index 986840843..c24b2a083 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.5.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon.S b/arm/filter_neon.S index c226cd4a8..827d1a390 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.5.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/libpng-manual.txt b/libpng-manual.txt index d627585da..ad32aa2d4 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta12 - April 29, 2013 + libpng version 1.7.0beta12 - April 30, 2013 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta12 - April 29, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta12 - April 30, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5215,7 +5215,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -April 29, 2013 +April 30, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 29, 2013" +.TH LIBPNG 3 "April 30, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta12 .SH SYNOPSIS @@ -494,7 +494,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta12 - April 29, 2013 + libpng version 1.7.0beta12 - April 30, 2013 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta12 - April 29, 2013 + libpng versions 0.97, January 1998, through 1.7.0beta12 - April 30, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5710,7 +5710,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -April 29, 2013 +April 30, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5980,7 +5980,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta12 - April 29, 2013: +Libpng version 1.7.0beta12 - April 30, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6003,7 +6003,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta12, April 29, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta12, April 30, 2013, are Copyright (c) 2004,2006-2007 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 @@ -6102,7 +6102,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 29, 2013 +April 30, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8b4a2bf11..15ea02f87 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 26, 2013" +.TH LIBPNGPF 3 "April 30, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta12 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "April 26, 2013" +.TH PNG 5 "April 30, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta12 - April 26, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta12 - April 30, 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.7.0beta12 - April 26, 2013\ + return "libpng version 1.7.0beta12 - April 30, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta12 - April 26, 2013 + * libpng version 1.7.0beta12 - April 30, 2013 * Copyright (c) 1998-2013 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.0beta12 - April 26, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta12 - April 30, 2013: 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.0beta12, April 26, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta12, April 30, 2013, 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: * ========================= * - * April 26, 2013 + * April 30, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta12" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta12 - April 26, 2013\n" + " libpng version 1.7.0beta12 - April 30, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta12 - April 26, 2013 + * libpng version 1.7.0beta12 - April 30, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1256,8 +1256,6 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr, { /* This API is pretty pointless in 1.6.0 because the location can be set * before the call to png_set_unknown_chunks. - * - * TODO: add a png_app_warning in 1.7 */ if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk < info_ptr->unknown_chunks_num) @@ -1276,6 +1274,10 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr, info_ptr->unknown_chunks[chunk].location = check_location(png_ptr, location); } + + /* TODO: make this an error in 1.8 (or maybe it will become one in 1.7!) */ + else if (png_ptr != NULL) + png_app_warning(png_ptr, "unknown chunk index out of range"); } #endif diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ca047a171..21e9effd8 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta12 - April 26, 2013 +libpng version 1.7.0beta12 - April 30, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ddd1175b6..e938ca08b 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.7.0beta12 - April 26, 2013 + * libpng version 1.7.0beta12 - April 30, 2013 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index be62a32ab..9bb56eeff 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.7.0beta12 - April 26, 2013 +Makefiles for libpng version 1.7.0beta12 - April 30, 2013 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 1b4fc5b30..dbc4f1928 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.7.0beta12 - April 26, 2013 */ +/* Libpng version 1.7.0beta12 - April 30, 2013 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ |