From e88e221d91910e04dd7d8c593bfafe86e59a5381 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 7 Feb 2013 21:52:29 -0600 Subject: [PATCH] [libpng17] Make tests/pngstest* work with the original Bourne shell --- ANNOUNCE | 13 +++++++++++-- CHANGES | 11 ++++++++++- LICENSE | 4 ++-- Makefile.am | 24 +++++++++++++----------- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- 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 +- tests/pngstest | 13 +++++++++++++ tests/pngstest-0g01 | 23 +---------------------- tests/pngstest-0g02 | 23 +---------------------- tests/pngstest-0g04 | 23 +---------------------- tests/pngstest-0g08 | 23 +---------------------- tests/pngstest-0g16 | 23 +---------------------- tests/pngstest-2c08 | 23 +---------------------- tests/pngstest-2c16 | 23 +---------------------- tests/pngstest-3p01 | 23 +---------------------- tests/pngstest-3p02 | 23 +---------------------- tests/pngstest-3p04 | 23 +---------------------- tests/pngstest-3p08 | 23 +---------------------- tests/pngstest-4a08 | 23 +---------------------- tests/pngstest-4a16 | 23 +---------------------- tests/pngstest-6a08 | 23 +---------------------- tests/pngstest-6a16 | 23 +---------------------- tests/pngstest-error | 33 ++++++++++++--------------------- 33 files changed, 101 insertions(+), 392 deletions(-) create mode 100755 tests/pngstest diff --git a/ANNOUNCE b/ANNOUNCE index 5c547ab65..476cd6877 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0alpha11 - February 7, 2013 +Libpng 1.7.0alpha11 - February 8, 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. @@ -134,11 +134,20 @@ Version 1.7.0alpha10 [February 5, 2013] in double quotes unless it is to be macro substituted the fix should work everywhere. -Version 1.7.0alpha11 [February 7, 2013] +Version 1.7.0alpha11 [February 8, 2013] Enable parallel tests and rearrange TESTS order to take advantage of the massive speed improvements use a make capable of parallel builds on a multi-CPU machine and pass the right arguments to make (-j10000 for GNU make) to get the build to run in parallel. + Fixed previous support for Z_PREFIX in configure builds, corrected + sCAL APIs; some of these use floating point arithmetic so need to be + disabled if floating point arithmetic is switched off. This is a quiet API + change - previously it appeared that the APIs were supported if fixed point + arithmetic was used internally, however they required certain APIs (floor, + modf, frexp, atof) that are part of C floating point support. Changed + png_fixed and the gamma code specific version of the same to avoid floor(), + which may be a library function (not an intrinsic). Removed unused #if 0 + code. =========================================================================== NOTICE November 17, 2012: diff --git a/CHANGES b/CHANGES index 69185e973..a0de31370 100644 --- a/CHANGES +++ b/CHANGES @@ -4420,11 +4420,20 @@ Version 1.7.0alpha10 [February 5, 2013] in double quotes unless it is to be macro substituted the fix should work everywhere. -Version 1.7.0alpha11 [February 7, 2013] +Version 1.7.0alpha11 [February 8, 2013] Enable parallel tests and rearrange TESTS order to take advantage of the massive speed improvements use a make capable of parallel builds on a multi-CPU machine and pass the right arguments to make (-j10000 for GNU make) to get the build to run in parallel. + Fixed previous support for Z_PREFIX in configure builds, corrected + sCAL APIs; some of these use floating point arithmetic so need to be + disabled if floating point arithmetic is switched off. This is a quiet API + change - previously it appeared that the APIs were supported if fixed point + arithmetic was used internally, however they required certain APIs (floor, + modf, frexp, atof) that are part of C floating point support. Changed + png_fixed and the gamma code specific version of the same to avoid floor(), + which may be a library function (not an intrinsic). Removed unused #if 0 + code. =========================================================================== NOTICE November 17, 2012: diff --git a/LICENSE b/LICENSE index b970e2e09..2d5430204 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.0alpha11, February 7, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha11, February 8, 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 -February 7, 2013 +February 8, 2013 diff --git a/Makefile.am b/Makefile.am index e2ed796fb..d0441efe3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,14 +23,7 @@ pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la # Generally these are single line shell scripts to run a test with a particular # set of parameters: -TESTS = tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\ - tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\ - tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\ - tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\ - tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\ - tests/pngstest-error tests/pngtest tests/pngunknown-IDAT\ - tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\ - tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg\ +TESTS =\ tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\ tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\ tests/pngvalid-gamma-expand16-background\ @@ -39,7 +32,17 @@ TESTS = tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\ tests/pngvalid-progressive-interlace-size\ tests/pngvalid-progressive-interlace-standard\ tests/pngvalid-progressive-interlace-transform\ - tests/pngvalid-progressive-standard tests/pngvalid-standard + tests/pngvalid-progressive-standard tests/pngvalid-standard\ + tests/pngtest\ + tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\ + tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\ + tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\ + tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\ + tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\ + tests/pngstest-error tests/pngunknown-IDAT\ + tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\ + tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg + # These tests are expected, and required, to fail: XFAIL_TESTS = tests/pngstest-error @@ -98,8 +101,7 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc EXTRA_DIST= \ ANNOUNCE CHANGES INSTALL LICENSE README TODO \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ - ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ - $(TESTS) \ + contrib projects scripts tests \ CMakeLists.txt example.c libpng-manual.txt SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn diff --git a/README b/README index a7c3cdaab..0955f80c4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0alpha11 - February 7, 2013 (shared library 17.0) +README for libpng version 1.7.0alpha11 - February 8, 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/libpng-manual.txt b/libpng-manual.txt index d66c542fd..2c0467143 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.0alpha11 - February 7, 2013 + libpng version 1.7.0alpha11 - February 8, 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.7.0alpha11 - February 7, 2013 + libpng versions 0.97, January 1998, through 1.7.0alpha11 - February 8, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5166,7 +5166,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -February 7, 2013 +February 8, 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 600c893cc..3235a48e5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 7, 2013" +.TH LIBPNG 3 "February 8, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha11 .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.0alpha11 - February 7, 2013 + libpng version 1.7.0alpha11 - February 8, 2013 Updated and distributed by Glenn Randers-Pehrson 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.0alpha11 - February 7, 2013 + libpng versions 0.97, January 1998, through 1.7.0alpha11 - February 8, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5661,7 +5661,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -February 7, 2013 +February 8, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5930,7 +5930,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0alpha11 - February 7, 2013: +Libpng version 1.7.0alpha11 - February 8, 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). @@ -5953,7 +5953,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha11, February 7, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha11, February 8, 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 @@ -6052,7 +6052,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 7, 2013 +February 8, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9fa24d15d..a9b443833 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 7, 2013" +.TH LIBPNGPF 3 "February 8, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0alpha11 (private functions) diff --git a/png.5 b/png.5 index ec3efaff9..10bcd0ba0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 7, 2013" +.TH PNG 5 "February 8, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6e1e0f12c..29a01f948 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.0alpha11 - February 7, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0alpha11 - February 8, 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.0alpha11 - February 7, 2013\ + return "libpng version 1.7.0alpha11 - February 8, 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 3bfded363..61b1ed014 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0alpha11 - February 7, 2013 + * libpng version 1.7.0alpha11 - February 8, 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.0alpha11 - February 7, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0alpha11 - February 8, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -199,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha11, February 7, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0alpha11, February 8, 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: @@ -311,7 +311,7 @@ * Y2K compliance in libpng: * ========================= * - * February 7, 2013 + * February 8, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -379,7 +379,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0alpha11" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0alpha11 - February 7, 2013\n" + " libpng version 1.7.0alpha11 - February 8, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 558a467df..2f8433358 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0alpha11 - February 7, 2013 + * libpng version 1.7.0alpha11 - February 8, 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 c2277e808..a9349a353 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0alpha11 - February 7, 2013 +libpng version 1.7.0alpha11 - February 8, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index dec92b89f..0d6968fe8 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@