[devel] Imported from libpng-1.5.0beta22.tarv1.5.0beta22

13 files changed, 106 insertions, 36 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d488efa..7e97cf777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(${PNG_LIB_NAME} PROPERTIES
-#   VERSION 15.${PNGLIB_RELEASE}.1.5.0beta21
+#   VERSION 15.${PNGLIB_RELEASE}.1.5.0beta22
     VERSION 15.${PNGLIB_RELEASE}.0
     SOVERSION 15
     CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index e000e13bf..14d320faa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.5.0beta21 - April 27, 2010
+Installing libpng version 1.5.0beta22 - April 28, 2010
 
 On Unix/Linux and similar systems, you can simply type
 
@@ -46,7 +46,7 @@ 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-1.5.0beta21" or "libpng15" and "zlib-1.2.3"
+might be called "libpng-1.5.0beta22" or "libpng15" and "zlib-1.2.3"
 or "zlib123") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
diff --git a/LICENSE b/LICENSE
index a45334f73..4d45df326 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.5.0beta21, April 27, 2010, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.0beta22, April 28, 2010, 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
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-April 27, 2010
+April 28, 2010
diff --git a/Makefile.am b/Makefile.am
index 9d8429349..61f3521a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,10 +123,9 @@ SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
 # The .dfn file for pnglibconf.h is machine generated
 pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	rm -f $@ dfn?.out
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
-	    ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
-	    dfn1.out 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
+	    ${srcdir}/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
 	rm dfn1.out
 	mv dfn2.out $@
 
@@ -145,10 +144,9 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	rm -f $@ dfn?.out
 	test -z "$(CPPFLAGS)" 
 	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
 	    logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
-	    logunsupported=1 dfn1.out 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
 	rm dfn1.out
 	mv dfn2.out $@
 
diff --git a/Makefile.in b/Makefile.in
index 18130df6f..ec0442f18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1286,10 +1286,9 @@ scripts/pnglibconf.h:
 # The .dfn file for pnglibconf.h is machine generated
 pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	rm -f $@ dfn?.out
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
-	    ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
-	    dfn1.out 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
+	    ${srcdir}/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
 	rm dfn1.out
 	mv dfn2.out $@
 
@@ -1308,10 +1307,9 @@ scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk
 	rm -f $@ dfn?.out
 	test -z "$(CPPFLAGS)" 
 	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=1 out=dfn1.out\
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out\
 	    logunsupported=1 - ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk pre=0 out=dfn2.out\
-	    logunsupported=1 dfn1.out 1>&2
+	$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
 	rm dfn1.out
 	mv dfn2.out $@
 
diff --git a/README b/README
index 54aff0b72..906094c34 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.0beta21 - April 27, 2010 (shared library 15.0)
+README for libpng version 1.5.0beta22 - April 28, 2010 (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/configure b/configure
index 55b6a0452..a169aef48 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta21.
+# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta22.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.5.0beta21'
-PACKAGE_STRING='libpng 1.5.0beta21'
+PACKAGE_VERSION='1.5.0beta22'
+PACKAGE_STRING='libpng 1.5.0beta22'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.5.0beta21 to adapt to many kinds of systems.
+\`configure' configures libpng 1.5.0beta22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1502,7 +1502,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.5.0beta21:";;
+     short | recursive ) echo "Configuration of libpng 1.5.0beta22:";;
    esac
   cat <<\_ACEOF
 
@@ -1607,7 +1607,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.5.0beta21
+libpng configure 1.5.0beta22
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.5.0beta21, which was
+It was created by libpng $as_me 1.5.0beta22, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2840,7 +2840,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.5.0beta21'
+ VERSION='1.5.0beta22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2904,7 +2904,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.5.0beta21
+PNGLIB_VERSION=1.5.0beta22
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=0
@@ -12119,7 +12119,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.5.0beta21, which was
+This file was extended by libpng $as_me 1.5.0beta22, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12185,7 +12185,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng config.status 1.5.0beta21
+libpng config.status 1.5.0beta22
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b4d1339af..cdf0c96b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.5.0beta21], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.5.0beta22], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.5.0beta21
+PNGLIB_VERSION=1.5.0beta22
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=5
 PNGLIB_RELEASE=0
diff --git a/contrib/pngminim/README b/contrib/pngminim/README
new file mode 100644
index 000000000..51d5a3c23
--- /dev/null
+++ b/contrib/pngminim/README
@@ -0,0 +1,4 @@
+This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
+to build minimal decoder, encoder, and progressive reader applications.
+
+See the individual README and pngusr.dfa files for more explanation.
diff --git a/contrib/pngminim/pngusr.h b/contrib/pngminim/pngusr.h
new file mode 100644
index 000000000..2ed60d80d
--- /dev/null
+++ b/contrib/pngminim/pngusr.h
@@ -0,0 +1,70 @@
+/* minrdpngconf.h: headers to make a minimal png-read-only library
+ *
+ * Copyright (c) 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
+ */
+
+#ifndef MINPRDPNGCONF_H
+#define MINPRDPNGCONF_H
+
+#define PNG_USER_PRIVATEBUILD "PNG minimal build"
+#define PNG_USER_DLLFNAME_POSTFIX "MN"
+
+#define PNG_NO_WARNINGS
+#define PNG_NO_ERROR_TEXT
+
+#define PNG_NO_SEQUENTIAL_READ
+#define PNG_NO_READ_BGR
+#define PNG_NO_READ_QUANTIZE
+#define PNG_NO_READ_INVERT
+#define PNG_NO_READ_SHIFT
+#define PNG_NO_READ_PACK
+#define PNG_NO_READ_PACKSWAP
+#define PNG_NO_READ_FILLER
+#define PNG_NO_READ_SWAP
+#define PNG_NO_READ_SWAP_ALPHA
+#define PNG_NO_READ_INVERT_ALPHA
+#define PNG_NO_READ_RGB_TO_GRAY
+#define PNG_NO_READ_USER_TRANSFORM
+#define PNG_NO_READ_cHRM
+#define PNG_NO_READ_hIST
+#define PNG_NO_READ_iCCP
+#define PNG_NO_READ_pCAL
+#define PNG_NO_READ_pHYs
+#define PNG_NO_READ_sBIT
+#define PNG_NO_READ_sCAL
+#define PNG_NO_READ_sPLT
+#define PNG_NO_READ_TEXT
+#define PNG_NO_READ_tIME
+#define PNG_NO_READ_UNKNOWN_CHUNKS
+#define PNG_NO_READ_USER_CHUNKS
+#define PNG_NO_READ_EMPTY_PLTE
+#define PNG_NO_READ_OPT_PLTE
+#define PNG_NO_READ_STRIP_ALPHA
+#define PNG_NO_READ_oFFs
+
+#define PNG_NO_WRITE_SUPPORTED
+
+#define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
+#define PNG_NO_USER_MEM
+#define PNG_NO_FIXED_POINT_SUPPORTED
+#define PNG_NO_MNG_FEATURES
+#define PNG_NO_USER_TRANSFORM_PTR
+#define PNG_NO_HANDLE_AS_UNKNOWN
+#define PNG_NO_CONSOLE_IO
+#define PNG_NO_ZALLOC_ZERO
+#define PNG_NO_ERROR_NUMBERS
+#define PNG_NO_EASY_ACCESS
+#define PNG_NO_USER_LIMITS
+#define PNG_NO_SET_USER_LIMITS
+#define PNG_NO_CONVERT_tIME
+#define PNG_NO_CONVERT_TIME_RFC1123
+#define PNG_NO_TIME_RFC1123
+
+#endif /* MINPRDPNGCONF_H */
diff --git a/png.5 b/png.5
index d5f081bd8..cf4437030 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 27, 2010"
+.TH PNG 5 "April 28, 2010"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 019a18322..152d19de2 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.0beta21 - April 27, 2010
+libpng version 1.5.0beta22 - April 28, 2010
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index caf74d0e0..b5e153528 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source and build
  *
- * libpng version 1.5.0beta21 - April 27, 2010
+ * libpng version 1.5.0beta22 - April 28, 2010
  *
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  *