diff --git a/ANNOUNCE b/ANNOUNCE index 286b07d01..f7cd46235 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,34 +1,38 @@ -Libpng 1.4.11 - March 29, 2012 +Libpng 1.4.12beta01 - April 26, 2012 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.4.11.tar.xz (LZMA-compressed, recommended) - libpng-1.4.11.tar.gz - libpng-1.4.11.tar.bz2 + 1.4.12beta01.tar.xz (LZMA-compressed, recommended) + 1.4.12beta01.tar.gz + 1.4.12beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1411.7z (LZMA-compressed, recommended) - lpng1411.zip + lp1412b01.7z (LZMA-compressed, recommended) + lp1412b01.zip Other information: - libpng-1.4.11-README.txt - libpng-1.4.11-LICENSE.txt + 1.4.12beta01-README.txt + 1.4.12beta01-LICENSE.txt Changes since the last public release (1.4.10): +version 1.4.11 [March 29, 2012] Revised png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048). Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. +version 1.4.12 [April 26, 2012] + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index 9e4d25378..08518b968 100644 --- a/CHANGES +++ b/CHANGES @@ -2868,6 +2868,8 @@ version 1.4.11 [March 29, 2012] CVE-2011-3048). Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. +version 1.4.12 [April 26, 2012] + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e761f916..d3e7e6ab4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) -set(PNGLIB_RELEASE 11) +set(PNGLIB_RELEASE 12) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.11 +# VERSION 14.${PNGLIB_RELEASE}.1.4.12beta01 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 2c82499e9..6d4a508a5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.11 - March 29, 2012 +Installing libpng version 1.4.12beta01 - April 26, 2012 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.4.11" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.12beta01" or "libpng14" 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 ea5d214be..1cb07b89e 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.4.11, March 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.12beta01, April 26, 2012, are Copyright (c) 2004, 2006-2010 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 -March 29, 2012 +April 26, 2012 diff --git a/Makefile.am b/Makefile.am index 2bcff35d8..75c6ede5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.11.txt + example.c libpng-1.4.12beta01.txt CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 3baab0d7a..1ff6035d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -332,7 +332,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.11.txt + example.c libpng-1.4.12beta01.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/README b/README index 3fcb65d52..addb57404 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.11 - March 29, 2012 (shared library 14.0) +README for libpng version 1.4.12beta01 - April 26, 2012 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -182,9 +182,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.11) + (gcc, creates libpng14.so.14.1.4.12beta01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.11) + (gcc, creates libpng14.so.14.1.4.12beta01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -206,12 +206,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.11) + (gcc, creates libpng14.so.14.1.4.12beta01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.11) + (gcc, creates libpng14.so.14.1.4.12beta01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.11) + (gcc, creates libpng14.so.14.1.4.12beta01) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/configure b/configure index 8bd9e2039..32b6a52d3 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.4.11. +# Generated by GNU Autoconf 2.65 for libpng 1.4.12beta01. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.11' -PACKAGE_STRING='libpng 1.4.11' +PACKAGE_VERSION='1.4.12beta01' +PACKAGE_STRING='libpng 1.4.12beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.4.11 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.12beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.11:";; + short | recursive ) echo "Configuration of libpng 1.4.12beta01:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.11 +libpng configure 1.4.12beta01 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.4.11, which was +It was created by libpng $as_me 1.4.12beta01, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.11' + VERSION='1.4.12beta01' cat >>confdefs.h <<_ACEOF @@ -2764,10 +2764,10 @@ fi -PNGLIB_VERSION=1.4.11 +PNGLIB_VERSION=1.4.12beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=11 +PNGLIB_RELEASE=12 @@ -12175,7 +12175,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.4.11, which was +This file was extended by libpng $as_me 1.4.12beta01, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,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.4.11 +libpng config.status 1.4.12beta01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 245fa8e7d..188ef4116 100644 --- a/configure.ac +++ b/configure.ac @@ -16,17 +16,17 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.11], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.12beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.11 +PNGLIB_VERSION=1.4.12beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=11 +PNGLIB_RELEASE=12 dnl End of version number stuff diff --git a/libpng-1.4.11.txt b/libpng-1.4.12beta01.txt similarity index 99% rename from libpng-1.4.11.txt rename to libpng-1.4.12beta01.txt index f01f9ee49..85be8ff2e 100644 --- a/libpng-1.4.11.txt +++ b/libpng-1.4.12beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.11 - March 29, 2012 + libpng version 1.4.12beta01 - April 26, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.11 - March 29, 2012 + libpng versions 0.97, January 1998, through 1.4.12beta01 - April 26, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.11, not all possible expansions are supported. +As of libpng version 1.4.12beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3312,13 +3312,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -March 29, 2012 +April 26, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.11 are Y2K compliant. It is my belief that earlier +upward through 1.4.12beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 8026345fc..1e5622432 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 29, 2012" +.TH LIBPNG 3 "April 26, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.12beta01 .SH SYNOPSIS \fI\fB @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.11 - March 29, 2012 + libpng version 1.4.12beta01 - April 26, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.11 - March 29, 2012 + libpng versions 0.97, January 1998, through 1.4.12beta01 - April 26, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1801,7 +1801,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.11, not all possible expansions are supported. +As of libpng version 1.4.12beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4207,13 +4207,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -March 29, 2012 +April 26, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.11 are Y2K compliant. It is my belief that earlier +upward through 1.4.12beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -4421,6 +4421,7 @@ the first widely used release: 1.4.10 14 10410 14.so.14.10[.0] 1.4.11rc01 14 10411 14.so.14.11[.0] 1.4.11 14 10411 14.so.14.11[.0] + 1.4.12beta01 14 10412 14.so.14.12[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4476,7 +4477,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.11 - March 29, 2012: +Libpng version 1.4.12beta01 - April 26, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4499,7 +4500,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.11, March 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.12beta01, April 26, 2012, 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 @@ -4598,7 +4599,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 29, 2012 +April 26, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index edb2138af..a33fbf338 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 29, 2012" +.TH LIBPNGPF 3 "April 26, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.11 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.12beta01 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 34f0e5908..ce98b56c0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 29, 2012" +.TH PNG 5 "April 26, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b6b76aa5b..b65e5dfdc 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_11 Your_png_h_is_not_version_1_4_11; +typedef version_1_4_12beta01 Your_png_h_is_not_version_1_4_12beta01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.11 - March 29, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.4.12beta01 - April 26, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.11 - March 29, 2012\ + return ((png_charp) "libpng version 1.4.12beta01 - April 26, 2012\ Copyright (c) 1998-2010 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 13ada5f7a..d7904724d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.11 - March 29, 2012 + * libpng version 1.4.12beta01 - April 26, 2012 * Copyright (c) 1998-2011 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.4.11 - March 29, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.4.12beta01 - April 26, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -169,6 +169,7 @@ * 1.4.10 14 10410 14.so.14.10[.0] * 1.4.11rc01 14 10411 14.so.14.11[.0] * 1.4.11 14 10411 14.so.14.11[.0] + * 1.4.12beta01 14 10412 14.so.14.12[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -200,7 +201,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.11, March 29, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.12beta01, April 26, 2012, are * Copyright (c) 2004, 2006-2010 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: @@ -312,13 +313,13 @@ * Y2K compliance in libpng: * ========================= * - * March 29, 2012 + * April 26, 2012 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.11 are Y2K compliant. It is my belief that earlier + * upward through 1.4.12beta01 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -374,9 +375,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.11" +#define PNG_LIBPNG_VER_STRING "1.4.12beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.11 - March 29, 2012\n" + " libpng version 1.4.12beta01 - April 26, 2012\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -384,12 +385,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 4 -#define PNG_LIBPNG_VER_RELEASE 11 +#define PNG_LIBPNG_VER_RELEASE 12 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -406,7 +407,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -414,7 +415,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10411 /* 1.4.11 */ +#define PNG_LIBPNG_VER 10412 /* 1.4.12 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1500,7 +1501,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_4_11; +typedef png_structp version_1_4_12beta01; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 5ad04853c..b8b5c6191 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.11 - March 29, 2012 + * libpng version 1.4.12beta01 - April 26, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 5d492162c..f74e50922 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.11 - March 29, 2012 + * libpng version 1.4.12beta01 - April 26, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 5ac8d243a..1bd865ca1 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1702,4 +1702,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_11 your_png_h_is_not_version_1_4_11; +typedef version_1_4_12beta01 your_png_h_is_not_version_1_4_12beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index f8a237719..53659feff 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.11 - March 29, 2012 +libpng version 1.4.12beta01 - April 26, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index aded09dea..3079bfef2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@