diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-05-07 21:41:15 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-05-07 22:04:26 -0500 |
commit | f3d737dad1ddbe1b75a79079d017f36f3053f90f (patch) | |
tree | 263694763cfc8c32ec31304bf8fbeb6dd10737fc | |
parent | 492ef9c964e1b253cdbc65874869b03554ae11f5 (diff) | |
download | libpng-f3d737dad1ddbe1b75a79079d017f36f3053f90f.tar.gz |
[devel] Imported from libpng-1.5.3beta06.tarv1.5.3beta06
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | Makefile.in | 14 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 4 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 2 |
11 files changed, 21 insertions, 21 deletions
@@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 7, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.3beta06, May 8, 2011, are Copyright (c) 2004, 2006-2011 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 -May 7, 2011 +May 8, 2011 diff --git a/Makefile.am b/Makefile.am index 0bd4ba98d..f5e64036b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,13 +18,13 @@ pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngvalid_SOURCES = pngvalid.c pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh -TESTS_ENVIRONMENT= srcdir=$(srcdir) +TESTS_ENVIRONMENT= srcdir=$(srcdir) # man pages dist_man_MANS= libpng.3 libpngpf.3 png.5 # generate the -config scripts if required -binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config +binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config bin_SCRIPTS= @binconfigs@ @@ -159,7 +159,7 @@ scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.ou # be empty - no non-standard defines scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk rm -f $@ dfn?.out - test -z "$(CPPFLAGS)" + test -z "$(CPPFLAGS)" echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\ logunsupported=3 - ${srcdir}/scripts/pnglibconf.dfa 1>&2 diff --git a/Makefile.in b/Makefile.in index 5410f1bfb..20e0111c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -252,7 +252,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ # generate the -config scripts if required -binconfigs = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config +binconfigs = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -310,7 +310,7 @@ pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la pngvalid_SOURCES = pngvalid.c pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la TESTS = test-pngtest.sh test-pngvalid-simple.sh test-pngvalid-full.sh -TESTS_ENVIRONMENT = srcdir=$(srcdir) +TESTS_ENVIRONMENT = srcdir=$(srcdir) # man pages dist_man_MANS = libpng.3 libpngpf.3 png.5 @@ -413,7 +413,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -455,7 +455,7 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la: $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES) +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la: $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LINK) -rpath $(libdir) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @@ -466,10 +466,10 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -pngtest$(EXEEXT): $(pngtest_OBJECTS) $(pngtest_DEPENDENCIES) +pngtest$(EXEEXT): $(pngtest_OBJECTS) $(pngtest_DEPENDENCIES) @rm -f pngtest$(EXEEXT) $(LINK) $(pngtest_OBJECTS) $(pngtest_LDADD) $(LIBS) -pngvalid$(EXEEXT): $(pngvalid_OBJECTS) $(pngvalid_DEPENDENCIES) +pngvalid$(EXEEXT): $(pngvalid_OBJECTS) $(pngvalid_DEPENDENCIES) @rm -f pngvalid$(EXEEXT) $(LINK) $(pngvalid_OBJECTS) $(pngvalid_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @@ -1319,7 +1319,7 @@ scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.ou # be empty - no non-standard defines scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk rm -f $@ dfn?.out - test -z "$(CPPFLAGS)" + test -z "$(CPPFLAGS)" echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\ logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2 @@ -1,4 +1,4 @@ -README for libpng version 1.5.3beta06 - May 7, 2011 (shared library 15.0) +README for libpng version 1.5.3beta06 - May 8, 2011 (shared library 15.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/libpngpf.3 b/libpngpf.3 index 2a91850da..b5b0c272c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "May 7, 2011" +.TH LIBPNGPF 3 "May 8, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.3beta06 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "May 7, 2011" +.TH PNG 5 "May 8, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -619,13 +619,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.3beta06 - May 7, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.3beta06 - May 8, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.5.3beta06 - May 7, 2011\ + return "libpng version 1.5.3beta06 - May 8, 2011\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.3beta06 - May 7, 2011 + * libpng version 1.5.3beta06 - May 8, 2011 * * Copyright (c) 1998-2011 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 4c632127b..0261ee169 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.3beta06 - May 7, 2011 +libpng version 1.5.3beta06 - May 8, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0e8da31ed..7feb75a14 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.3beta06 - May 7, 2011 + * libpng version 1.5.3beta06 - May 8, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 227e12650..2aecd237d 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.5.3beta06 - May 7, 2011 +Makefiles for libpng version 1.5.3beta06 - May 8, 2011 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile |