提交 b724c812 编写于 作者: J John Bowler 提交者: Glenn Randers-Pehrson

[libpng16] Enabled parallel tests - back ported from libpng-1.7.

上级 0695fcd8
...@@ -35,6 +35,7 @@ Version 1.6.1 [February 16, 2013] ...@@ -35,6 +35,7 @@ Version 1.6.1 [February 16, 2013]
which demonstrates the tokenization problem previously avoided by using /lib/cpp. which demonstrates the tokenization problem previously avoided by using /lib/cpp.
Since all .dfn output is now protected in double quotes unless it is to be macro Since all .dfn output is now protected in double quotes unless it is to be macro
substituted the fix should work everywhere. substituted the fix should work everywhere.
Enabled parallel tests - back ported from libpng-1.7.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
......
...@@ -4391,6 +4391,7 @@ Version 1.6.1 [February 16, 2013] ...@@ -4391,6 +4391,7 @@ Version 1.6.1 [February 16, 2013]
which demonstrates the tokenization problem previously avoided by using /lib/cpp. which demonstrates the tokenization problem previously avoided by using /lib/cpp.
Since all .dfn output is now protected in double quotes unless it is to be macro Since all .dfn output is now protected in double quotes unless it is to be macro
substituted the fix should work everywhere. substituted the fix should work everywhere.
Enabled parallel tests - back ported from libpng-1.7.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
......
...@@ -10,7 +10,7 @@ this sentence. ...@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, are libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 16, 2013, are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors with the following individual added to the list of Contributing Authors
...@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. ...@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
February 14, 2013 February 16, 2013
...@@ -7,24 +7,44 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ ...@@ -7,24 +7,44 @@ PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
ACLOCAL_AMFLAGS = -I scripts ACLOCAL_AMFLAGS = -I scripts
# test programs - run on make check, make distcheck # test programs - run on make check, make distcheck
TESTS_ENVIRONMENT= srcdir=$(srcdir) check_PROGRAMS= pngtest pngunknown pngstest pngvalid
check_PROGRAMS= pngtest
pngtest_SOURCES = pngtest.c pngtest_SOURCES = pngtest.c
pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
TESTS = test-pngtest.sh
# Only do the following if the contrib directory is present.
check_PROGRAMS+= pngvalid pngstest pngunknown
pngvalid_SOURCES = contrib/libtests/pngvalid.c pngvalid_SOURCES = contrib/libtests/pngvalid.c
pngstest_SOURCES = contrib/libtests/pngstest.c
pngunknown_SOURCES = contrib/libtests/pngunknown.c
pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
pngstest_SOURCES = contrib/libtests/pngstest.c
pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
pngunknown_SOURCES = contrib/libtests/pngunknown.c
pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
TESTS += contrib/libtests/test-pngunknown.sh\
contrib/libtests/test-pngvalid-simple.sh\ # Generally these are single line shell scripts to run a test with a particular
contrib/libtests/test-pngvalid-full.sh\ # set of parameters:
contrib/libtests/test-pngstest.sh 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\
tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\
tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\
tests/pngvalid-progressive-interlace-size\
tests/pngvalid-progressive-interlace-standard\
tests/pngvalid-progressive-interlace-transform\
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
# man pages # man pages
dist_man_MANS= libpng.3 libpngpf.3 png.5 dist_man_MANS= libpng.3 libpngpf.3 png.5
...@@ -77,12 +97,14 @@ nodist_pkginclude_HEADERS= pnglibconf.h ...@@ -77,12 +97,14 @@ nodist_pkginclude_HEADERS= pnglibconf.h
pkgconfigdir = @pkgconfigdir@ pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
#extra source distribution files. # Extra source distribution files, '${srcdir}' is used below to stop build files
# from those directories being included. This only works if the configure is
# not done in the source directory!
EXTRA_DIST= \ EXTRA_DIST= \
ANNOUNCE CHANGES INSTALL LICENSE README TODO \ ANNOUNCE CHANGES INSTALL LICENSE README TODO \
pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
$(TESTS) \ $(TESTS) $(XFAIL_TESTS) tests/pngstest \
CMakeLists.txt example.c libpng-manual.txt CMakeLists.txt example.c libpng-manual.txt
SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
......
README for libpng version 1.6.1beta01 - February 14, 2013 (shared library 16.0) README for libpng version 1.6.1beta01 - February 16, 2013 (shared library 16.0)
See the note about version numbers near the top of png.h See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. See INSTALL for instructions on how to install libpng.
......
...@@ -74,7 +74,7 @@ done ...@@ -74,7 +74,7 @@ done
# #
# The autotools generated files: # The autotools generated files:
libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\ libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\
config.sub configure depcomp install-sh ltmain.sh missing" config.sub configure depcomp install-sh ltmain.sh missing test-driver"
# #
# These are separate because 'maintainer-clean' does not remove them. # These are separate because 'maintainer-clean' does not remove them.
libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\ libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\
......
...@@ -26,9 +26,11 @@ AC_CONFIG_MACRO_DIR([scripts]) ...@@ -26,9 +26,11 @@ AC_CONFIG_MACRO_DIR([scripts])
# silent-rules requires automake 1.11 or later # silent-rules requires automake 1.11 or later
# dist-xz requires automake 1.11 or later # dist-xz requires automake 1.11 or later
# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules serial-tests]) # 1.13 is required for parallel tests
# was: AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
# AM_INIT_AUTOMAKE # The following line causes --disable-maintainer-mode to be the default to
# configure, this is necessary because libpng distributions cannot rely on the
# time stamps of the autotools generated files being correct
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
dnl configure.ac and Makefile.am expect automake 1.11.2 or a compatible later dnl configure.ac and Makefile.am expect automake 1.11.2 or a compatible later
......
...@@ -62,6 +62,12 @@ ...@@ -62,6 +62,12 @@
# define aligncastconst(type, value) ((const void*)(value)) # define aligncastconst(type, value) ((const void*)(value))
#endif /* __cplusplus */ #endif /* __cplusplus */
/* During parallel runs of pngstest each temporary file needs a unique name,
* this is used to permit uniqueness using a command line argument which can be
* up to 22 characters long.
*/
static char tmpf[23] = "TMP";
/* Generate random bytes. This uses a boring repeatable algorithm and it /* Generate random bytes. This uses a boring repeatable algorithm and it
* is implemented here so that it gives the same set of numbers on every * is implemented here so that it gives the same set of numbers on every
* architecture. It's a linear congruential generator (Knuth or Sedgewick * architecture. It's a linear congruential generator (Knuth or Sedgewick
...@@ -3198,7 +3204,7 @@ write_one_file(Image *output, Image *image, int convert_to_8bit) ...@@ -3198,7 +3204,7 @@ write_one_file(Image *output, Image *image, int convert_to_8bit)
static int counter = 0; static int counter = 0;
char name[32]; char name[32];
sprintf(name, "TMP%d.png", ++counter); sprintf(name, "%s%d.png", tmpf, ++counter);
if (png_image_write_to_file(&image->image, name, convert_to_8bit, if (png_image_write_to_file(&image->image, name, convert_to_8bit,
image->buffer+16, (png_int_32)image->stride, image->colormap)) image->buffer+16, (png_int_32)image->stride, image->colormap))
...@@ -3482,6 +3488,30 @@ main(int argc, char **argv) ...@@ -3482,6 +3488,30 @@ main(int argc, char **argv)
opts &= ~KEEP_GOING; opts &= ~KEEP_GOING;
else if (strcmp(arg, "--strict") == 0) else if (strcmp(arg, "--strict") == 0)
opts |= STRICT; opts |= STRICT;
else if (strcmp(arg, "--tmpfile") == 0)
{
if (c+1 < argc)
{
if (strlen(argv[++c]) >= sizeof tmpf)
{
fflush(stdout);
fprintf(stderr, "%s: %s is too long for a temp file prefix\n",
argv[0], argv[c]);
exit(99);
}
/* Safe: checked above */
strcpy(tmpf, argv[c]);
}
else
{
fflush(stdout);
fprintf(stderr, "%s: %s requires a temporary file prefix\n",
argv[0], arg);
exit(99);
}
}
else if (strcmp(arg, "--touch") == 0) else if (strcmp(arg, "--touch") == 0)
{ {
if (c+1 < argc) if (c+1 < argc)
...@@ -3492,7 +3522,7 @@ main(int argc, char **argv) ...@@ -3492,7 +3522,7 @@ main(int argc, char **argv)
fflush(stdout); fflush(stdout);
fprintf(stderr, "%s: %s requires a file name argument\n", fprintf(stderr, "%s: %s requires a file name argument\n",
argv[0], arg); argv[0], arg);
exit(1); exit(99);
} }
} }
else if (arg[0] == '+') else if (arg[0] == '+')
...@@ -3500,7 +3530,7 @@ main(int argc, char **argv) ...@@ -3500,7 +3530,7 @@ main(int argc, char **argv)
png_uint_32 format = formatof(arg+1); png_uint_32 format = formatof(arg+1);
if (format > FORMAT_COUNT) if (format > FORMAT_COUNT)
exit(1); exit(99);
format_set(&formats, format); format_set(&formats, format);
} }
...@@ -3508,7 +3538,7 @@ main(int argc, char **argv) ...@@ -3508,7 +3538,7 @@ main(int argc, char **argv)
{ {
fflush(stdout); fflush(stdout);
fprintf(stderr, "%s: unknown option: %s\n", argv[0], arg); fprintf(stderr, "%s: unknown option: %s\n", argv[0], arg);
exit(1); exit(99);
} }
else else
{ {
...@@ -3557,7 +3587,7 @@ main(int argc, char **argv) ...@@ -3557,7 +3587,7 @@ main(int argc, char **argv)
buffer[4095] = 0; buffer[4095] = 0;
fprintf(stderr, "%s...%s: file name too long\n", buffer, fprintf(stderr, "%s...%s: file name too long\n", buffer,
buffer+(4096-32)); buffer+(4096-32));
exit(1); exit(99);
} }
} }
...@@ -3676,7 +3706,7 @@ main(int argc, char **argv) ...@@ -3676,7 +3706,7 @@ main(int argc, char **argv)
{ {
fflush(stdout); fflush(stdout);
fprintf(stderr, "%s: write failed\n", touch); fprintf(stderr, "%s: write failed\n", touch);
exit(1); exit(99);
} }
} }
...@@ -3684,7 +3714,7 @@ main(int argc, char **argv) ...@@ -3684,7 +3714,7 @@ main(int argc, char **argv)
{ {
fflush(stdout); fflush(stdout);
fprintf(stderr, "%s: open failed\n", touch); fprintf(stderr, "%s: open failed\n", touch);
exit(1); exit(99);
} }
} }
...@@ -3695,6 +3725,7 @@ main(int argc, char **argv) ...@@ -3695,6 +3725,7 @@ main(int argc, char **argv)
int main(void) int main(void)
{ {
fprintf(stderr, "pngstest: no read support in libpng, test skipped\n"); fprintf(stderr, "pngstest: no read support in libpng, test skipped\n");
return 0; /* So the test is skipped: */
return 77;
} }
#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */ #endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
#!/bin/sh
#
# Run the simplified API tests
err=0
echo >> pngtest-log.txt
echo "============ pngstest.sh ==============" >> pngtest-log.txt
echo "Running test-pngstest.sh"
for image in ${srcdir}/contrib/pngsuite/*.png
do
for opts in ""
do
if ./pngstest --strict --log "$@" $opts $image >>pngtest-log.txt 2>&1
then
echo " PASS: pngstest $opts $image"
else
echo " FAIL: pngstest $opts $image"
err=1
fi
done
done
exit $err
#!/bin/sh
#
# Run the unknown API tests
err=0
image="${srcdir}/pngtest.png"
#
# stream 4 is used for the output of the shell, pngtest-log.txt gets all the
# normal program output.
exec 4>&1 1>>pngtest-log.txt 2>&1
echo
echo "============ test-pngunknown.sh =============="
echo "Running test-pngunknown.sh" >&4
for tests in \
"discard default=discard"\
"save default=save"\
"if-safe default=if-safe"\
"vpAg vpAg=if-safe"\
"sTER sTER=if-safe"\
"IDAT default=discard IDAT=save"\
"sAPI bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save"
do
set $tests
test="$1"
shift
if ./pngunknown "$@" "$image" 4>&-
then
echo " PASS: test-pngunknown $test" >&4
else
echo " FAIL: test-pngunknown $test" >&4
err=1
fi
done
exit $err
#!/bin/sh
#
# Run a sequence of gamma tests quietly
err=0
echo >> pngtest-log.txt
echo "============ pngvalid-full.sh ==============" >> pngtest-log.txt
echo "Running test-pngvalid-full.sh"
for gamma in threshold transform sbit 16-to-8 background alpha-mode "transform --expand16" "background --expand16" "alpha-mode --expand16"
do
if ./pngvalid "$@" --gamma-$gamma >> pngtest-log.txt 2>&1
then
echo " PASS: pngvalid" "$@" "--gamma-$gamma"
else
echo " FAIL: pngvalid" "$@" "--gamma-$gamma"
err=1
fi
done
exit $err
#!/bin/sh
#
# Run a sequence of tests quietly, without the slow
# gamma tests
err=0
echo >> pngtest-log.txt
echo "============ pngvalid-simple.sh ==============" >> pngtest-log.txt
echo "Running test-pngvalid-simple.sh"
# The options to test are:
#
# standard tests with and without progressive reading and interlace
# size images with and without progressive reading
# transform tests (standard, non-interlaced only)
#
for opts in "--standard" "--standard --progressive-read" \
"--standard --interlace" "--standard --progressive-read --interlace" \
"--size" "--size --progressive-read" \
"--transform"
do
if ./pngvalid "$@" $opts >> pngtest-log.txt 2>&1
then
echo " PASS: pngvalid" "$@" $opts
else
echo " FAIL: pngvalid" "$@" $opts
err=1
fi
done
exit $err
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.1beta01 - February 14, 2013 libpng version 1.6.1beta01 - February 16, 2013
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 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 ...@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013 libpng versions 0.97, January 1998, through 1.6.1beta01 - February 16, 2013
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson
...@@ -5150,7 +5150,7 @@ Other rules can be inferred by inspecting the libpng source. ...@@ -5150,7 +5150,7 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng XVI. Y2K Compliance in libpng
February 14, 2013 February 16, 2013
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
......
.TH LIBPNG 3 "February 14, 2013" .TH LIBPNG 3 "February 16, 2013"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01
.SH SYNOPSIS .SH SYNOPSIS
...@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. ...@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.6.1beta01 - February 14, 2013 libpng version 1.6.1beta01 - February 16, 2013
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 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 ...@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013 libpng versions 0.97, January 1998, through 1.6.1beta01 - February 16, 2013
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2013 Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson
...@@ -5655,7 +5655,7 @@ Other rules can be inferred by inspecting the libpng source. ...@@ -5655,7 +5655,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng .SH XVI. Y2K Compliance in libpng
February 14, 2013 February 16, 2013
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
...@@ -5926,7 +5926,7 @@ possible without all of you. ...@@ -5926,7 +5926,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.6.1beta01 - February 14, 2013: Libpng version 1.6.1beta01 - February 16, 2013:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
...@@ -5949,7 +5949,7 @@ this sentence. ...@@ -5949,7 +5949,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, are libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 16, 2013, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors with the following individual added to the list of Contributing Authors
...@@ -6048,7 +6048,7 @@ certification mark of the Open Source Initiative. ...@@ -6048,7 +6048,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
February 14, 2013 February 16, 2013
.\" end of man page .\" end of man page
.TH LIBPNGPF 3 "February 14, 2013" .TH LIBPNGPF 3 "February 16, 2013"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.1beta01
(private functions) (private functions)
......
.TH PNG 5 "February 14, 2013" .TH PNG 5 "February 16, 2013"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION
......
/* png.h - header file for PNG reference library /* png.h - header file for PNG reference library
* *
* libpng version 1.6.1beta01 - February 14, 2013 * libpng version 1.6.1beta01 - February 16, 2013
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.1beta01 - February 14, 2013: Glenn * libpng versions 0.97, January 1998, through 1.6.1beta01 - February 16, 2013: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* *
* libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 14, 2013, are * libpng versions 1.2.6, August 15, 2004, through 1.6.1beta01, February 16, 2013, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5 * distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors: * with the following individual added to the list of Contributing Authors:
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* February 14, 2013 * February 16, 2013
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.1beta01" #define PNG_LIBPNG_VER_STRING "1.6.1beta01"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.1beta01 - February 14, 2013\n" " libpng version 1.6.1beta01 - February 16, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16 #define PNG_LIBPNG_VER_DLLNUM 16
......
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.6.1beta01 - February 14, 2013 * libpng version 1.6.1beta01 - February 16, 2013
* *
* Copyright (c) 1998-2013 Glenn Randers-Pehrson * Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
......
VisualStudio instructions VisualStudio instructions
libpng version 1.6.1beta01 - February 14, 2013 libpng version 1.6.1beta01 - February 16, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- <!--
* zlib.props - location of zlib source * zlib.props - location of zlib source
* *
* libpng version 1.6.1beta01 - February 14, 2013 * libpng version 1.6.1beta01 - February 16, 2013
* *
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* *
......
#!/bin/sh
echo "Running tests. For details see pngtest-log.txt"
echo "============ pngtest pngtest.png ==============" > pngtest-log.txt
echo "Running test-pngtest.sh"
if ./pngtest --strict ${srcdir}/pngtest.png >> pngtest-log.txt 2>&1
then
echo " PASS: pngtest --strict pngtest.png"
err=0
else
echo " FAIL: pngtest --strict pngtest.png"
err=1
fi
exit $err
#!/bin/sh
#
# Usage:
#
# tests/pngstest pattern
#
# Runs pngstest on all the contrib/pngsuite/[^x]*${pattern}.png files
# NOTE: pattern is used to name the temporary files pngstest generates
#
pattern="$1"
shift
exec ./pngstest --strict --tmpfile "${pattern}" --log ${1+"$@"}\
"${srcdir}/contrib/pngsuite/"[a-wyz]*${pattern}".png"
#!/bin/sh
exec "${srcdir}/tests/pngstest" 0g01
#!/bin/sh
exec "${srcdir}/tests/pngstest" 0g02
#!/bin/sh
exec "${srcdir}/tests/pngstest" 0g04
#!/bin/sh
exec "${srcdir}/tests/pngstest" 0g08
#!/bin/sh
exec "${srcdir}/tests/pngstest" 0g16
#!/bin/sh
exec "${srcdir}/tests/pngstest" 2c08
#!/bin/sh
exec "${srcdir}/tests/pngstest" 2c16
#!/bin/sh
exec "${srcdir}/tests/pngstest" 3p01
#!/bin/sh
exec "${srcdir}/tests/pngstest" 3p02
#!/bin/sh
exec "${srcdir}/tests/pngstest" 3p04
#!/bin/sh
exec "${srcdir}/tests/pngstest" 3p08
#!/bin/sh
exec "${srcdir}/tests/pngstest" 4a08
#!/bin/sh
exec "${srcdir}/tests/pngstest" 4a16
#!/bin/sh
exec "${srcdir}/tests/pngstest" 6a08
#!/bin/sh
exec "${srcdir}/tests/pngstest" 6a16
#!/bin/sh
code=77 # skipped
for t in "${srcdir}/contrib/pngsuite/"x*".png"
do
if test "$t" != "${srcdir}/contrib/pngsuite/x*.png"
then
# not skipped, test it
if ./pngstest --strict --tmpfile "error" --log "$@" "$t"
then
code=0 # oops, success: should not happen!
fi
fi
done
exit $code
#!/bin/sh
exec ./pngtest --strict ${srcdir}/pngtest.png
#!/bin/sh
exec ./pngunknown default=discard IDAT=save "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown default=discard "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown default=if-safe "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown sTER=if-safe "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown default=save "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngunknown vpAg=if-safe "${srcdir}/pngtest.png"
#!/bin/sh
exec ./pngvalid --gamma-16-to-8
#!/bin/sh
exec ./pngvalid --gamma-alpha-mode
#!/bin/sh
exec ./pngvalid --gamma-background
#!/bin/sh
exec ./pngvalid --gamma-alpha-mode --expand16
#!/bin/sh
exec ./pngvalid --gamma-background --expand16
#!/bin/sh
exec ./pngvalid --gamma-transform --expand16
#!/bin/sh
exec ./pngvalid --gamma-sbit
#!/bin/sh
exec ./pngvalid --gamma-threshold
#!/bin/sh
exec ./pngvalid --gamma-transform
#!/bin/sh
exec ./pngvalid --size --progressive-read
#!/bin/sh
exec ./pngvalid --standard --progressive-read --interlace
#!/bin/sh
exec ./pngvalid --transform
#!/bin/sh
exec ./pngvalid --standard --interlace
#!/bin/sh
exec ./pngvalid --standard --progressive-read
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册