diff --git a/ANNOUNCE b/ANNOUNCE index 2567266c1d051441ba5f3d1f3e19a28e5a37e45f..5cea6760d90431c20935e90b2943a28be0d2ee3a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.1beta03 - February 19, 2013 +Libpng 1.6.1beta03 - February 22, 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. @@ -49,13 +49,14 @@ Version 1.6.1beta02 [February 19, 2013] Folded long lines. Reenabled code to allow zero length PLTE chunks for MNG. -Version 1.6.1beta03 [February 19, 2013] +Version 1.6.1beta03 [February 22, 2013] Fixed ALIGNED_MEMORY support. Allow run-time ARM NEON checking to be disabled. A new configure option: --enable-arm-neon=always will stop the run-time checks. New checks within arm/arm_init.c will cause the code not to be compiled unless __ARM_NEON__ is set. This should make it fail safe (if someone asks for it on then the build will fail if it can't be done.) + Updated the INSTALL document. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 9d26e2c214c313a4bc2fbfd081ef73c01c18ff43..b60f0e53070f32a559f0eb22674d7a42461fa695 100644 --- a/CHANGES +++ b/CHANGES @@ -4406,13 +4406,14 @@ Version 1.6.1beta02 [February 19, 2013] Folded long lines. Reenabled code to allow zero length PLTE chunks for MNG. -Version 1.6.1beta03 [February 19, 2013] +Version 1.6.1beta03 [February 22, 2013] Fixed ALIGNED_MEMORY support. Allow run-time ARM NEON checking to be disabled. A new configure option: --enable-arm-neon=always will stop the run-time checks. New checks within arm/arm_init.c will cause the code not to be compiled unless __ARM_NEON__ is set. This should make it fail safe (if someone asks for it on then the build will fail if it can't be done.) + Updated the INSTALL document. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 2644c7a4f892e189f07b13e07b2ddc4b95cd2b9a..972a4727e71855e501a7dd43ef8c94bd8165bdb1 100644 --- a/INSTALL +++ b/INSTALL @@ -41,16 +41,31 @@ is not already on your system. zlib can usually be found wherever you got libpng. zlib can be placed in another directory, at the same level as libpng. +If your system already has a preinstalled zlib you will still need +to have access to the zlib.h and zconf.h include files that +correspond to the version of zlib that's installed. + +If you wish to test with a particular zlib that is not first in the +standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS, +LIBS, and LD_LIBRARY_PATH in your environment before running "make test" +or "make distcheck": + +ZLIBLIB=/path/to/lib export ZLIBLIB +ZLIBINC=/path/to/include export ZLIBINC +INCLUDES="-I$ZLIBINC" export INCLUDES +LDFLAGS="-L$ZLIBLIB" export LDFLAGS +LIBS=$ZLIBLIB/libz.a export LIBS +LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH + +If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC +in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test". + If you want to use "cmake" (see www.cmake.org), type cmake . -DCMAKE_INSTALL_PREFIX=/path make make install -If your system already has a preinstalled zlib you will still need -to have access to the zlib.h and zconf.h include files that -correspond to the version of zlib that's installed. - You can rename the directories that you downloaded (they might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5" or "zlib125") so that you have directories called "zlib" and "libpng". @@ -71,6 +86,7 @@ Your directory structure should look like this: depcomp, install-sh, mkinstalldirs, test-pngtest.sh contrib gregbook + libtests pngminim pngminus pngsuite diff --git a/LICENSE b/LICENSE index d5888b81990fcad980c4eb6672e9a37ff788df6d..10682b983e444dad1101c4c872fa5b50616899db 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.6.1beta03, February 19, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 22, 2013, are Copyright (c) 2004, 2006-2012 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 -February 19, 2013 +February 22, 2013 diff --git a/README b/README index c981a369f92eab819e6e25ae6648989cb645cf79..e670716ff0d1446cb56278ebdb8e6dfde5b50c57 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.1beta03 - February 19, 2013 (shared library 16.0) +README for libpng version 1.6.1beta03 - February 22, 2013 (shared library 16.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 65dbd6ed18c137dd25efb8bffbde78a83731d88d..1ca9a9f47d46ea3db1dcc8b34d179f931c7574bd 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.6.1beta03 - February 19, 2013 + libpng version 1.6.1beta03 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson 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.6.1beta03 - February 19, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta03 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5151,7 +5151,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -February 19, 2013 +February 22, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 09a3088b317e3e22b4af8d635b8d269b2f207403..2e64ac6a243edf88498e3548a37e2574781bb0d8 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 19, 2013" +.TH LIBPNG 3 "February 22, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03 .SH SYNOPSIS @@ -504,7 +504,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.6.1beta03 - February 19, 2013 + libpng version 1.6.1beta03 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.1beta03 - February 19, 2013 + libpng versions 0.97, January 1998, through 1.6.1beta03 - February 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5656,7 +5656,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -February 19, 2013 +February 22, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5927,7 +5927,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.1beta03 - February 19, 2013: +Libpng version 1.6.1beta03 - February 22, 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). @@ -5950,7 +5950,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 19, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 22, 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 @@ -6049,7 +6049,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 19, 2013 +February 22, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f57f37c431170199a6351424e0208971a87a5f60..89f8f98bf5b885a6f77940d30a845cd3c6e9b698 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 19, 2013" +.TH LIBPNGPF 3 "February 22, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta03 (private functions) diff --git a/png.5 b/png.5 index d678a867bd79f59474968d0d3f574a4e01961103..a644a15d30352537f458984006ee50dc0909f162 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 19, 2013" +.TH PNG 5 "February 22, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 77d36f8fe8fa49b7b0896756edabf86ff50c7cc0..a90be4206c41be34d7b5c086dbdaffd09b9a1876 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.1beta03 - February 19, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.1beta03 - February 22, 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.1beta03 - February 19, 2013\ + return "libpng version 1.6.1beta03 - February 22, 2013\ Copyright (c) 1998-2013 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 95b5fef0dffbbbd7e692b2c883d95ab66da41210..c71736e2f1265ff5ddec678167799081f5f189db 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.1beta03 - February 19, 2013 + * libpng version 1.6.1beta03 - February 22, 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.6.1beta03 - February 19, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.1beta03 - February 22, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -201,7 +201,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 19, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta03, February 22, 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: @@ -313,7 +313,7 @@ * Y2K compliance in libpng: * ========================= * - * February 19, 2013 + * February 22, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -381,7 +381,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.1beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.1beta03 - February 19, 2013\n" + " libpng version 1.6.1beta03 - February 22, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 2969524e67fc59c9da925263b549965d9fd2d291..1dc935468f5927875e286c2642ba0f8cd080a573 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.1beta03 - February 19, 2013 + * libpng version 1.6.1beta03 - February 22, 2013 * * Copyright (c) 1998-2013 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 9ced9306d6403bc73659935c8b1d74d8a5d8091a..27e2f297824d4977e3ae816fabd25dd02b4d954a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.1beta03 - February 19, 2013 +libpng version 1.6.1beta03 - February 22, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index f3086a5c96fece135c349c8c0abb42384d342105..005012dbe2dcaabeca71e6cb7569247b868677b7 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@