diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-12-23 08:11:39 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:26:52 -0500 |
| commit | 74caee01a4327b825c08642e47541ded1320c4b2 (patch) | |
| tree | b03e14f4acbb7f1bb7f9659fdfe895777b2c5ee9 | |
| parent | 7836e2189432bc7b132789ae56abb8abb99be1cb (diff) | |
| download | libpng-74caee01a4327b825c08642e47541ded1320c4b2.tar.gz | |
[libpng10] Imported from libpng-1.0.52rc01.tarv1.0.52rc01
65 files changed, 229 insertions, 205 deletions
@@ -1,90 +1,71 @@ -Libpng 1.0.51 - December 3, 2009 +Libpng 1.0.52rc01 - December 23, 2009 -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.0.51.tar.xz (LZMA-compressed, recommended) - libpng-1.0.51.tar.gz - libpng-1.0.51.tar.bz2 + libpng-1.0.52rc01.tar.xz (LZMA-compressed, recommended) + libpng-1.0.52rc01.tar.gz + libpng-1.0.52rc01.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.51-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.0.51-no-config.tar.gz - libpng-1.0.51-no-config.tar.bz2 + libpng-1.0.52rc01-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.0.52rc01-no-config.tar.gz + libpng-1.0.52rc01-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1051.zip - lpng1051.7z - lpng1051.tar.bz2 + lp1052r01.zip + lp1052r01.7z + lp1052r01.tar.bz2 Project files - libpng-1.0.51-project-netware.zip - libpng-1.0.51-project-wince.zip + libpng-1.0.52rc01-project-netware.zip + libpng-1.0.52rc01-project-wince.zip Other information: - libpng-1.0.51-README.txt - libpng-1.0.51-KNOWNBUGS.txt - libpng-1.0.51-LICENSE.txt - libpng-1.0.51-Y2K-compliance.txt - -Changes since the last public release (1.0.50): - -version 1.0.51 [December 3, 2009] - - Moved redundant IHDR checking into new png_check_IHDR() in png.c - and report all errors found in the IHDR data. - Eliminated useless call to png_check_cHRM() from pngset.c - Expanded TAB characters in pngrtran.c - Added "xcode" project similar one already in libpng-1.4.0beta (Alam Arias). - Eliminated a shadowed declaration of "pp" in png_handle_sPLT(). - Revised pngconf.h to make it easier to enable iTXt support. From libpng - version 1.2.9 through 1.2.40, defining PNG_iTXt_SUPPORTED did not work - as expected. - Converted all PNG_NO_* tests to PNG_*_SUPPORTED everywhere except pngconf.h - Changed many "#if defined(x)" to "#ifdef x" and fixed some indentation. - Added png_calloc() as a non-exported function. - Relocated png_do_chop() ahead of building gamma tables in pngrtran.c - This avoids building 16-bit gamma tables unnecessarily. - Removed a harmless extra png_set_invert_alpha() from pngwrite.c - Bugfixes and improvements to CMakeLists.txt (Philip Lowman) - Moved CMakeLists.txt from scripts into the main libpng directory. - Patched ltmain.sh for wince support. - Added PNG_CONVERT_tIME_SUPPORTED macro. - Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED - Updated scripts/pngw32.def and projects/wince/png32ce.def - Copied projects/wince/png32ce.def to the scripts directory. - Added scripts/makefile.cegcc - Added PNG_DEPSTRUCT, PNG_DEPRECATED, PNG_USE_RESULT, PNG_NORETURN, and - PNG_ALLOCATED macros to detect deprecated direct access to the - png_struct or info_struct members and other deprecated usage in - applications (John Bowler). - Removed three direct references to read_info_ptr members in pngtest.c - that were detected by the new PNG_DEPSTRUCT macro. - Marked deprecated function prototypes with PNG_DEPRECATED. - Marked memory allocation function prototypes with PNG_ALLOCATED. - Changed png_check_sig() to !png_sig_cmp() in contrib programs. - Corrected the png_get_IHDR() call in contrib/gregbook/readpng2.c - Marked nonexported functions with PNG_PRIVATE macro. - Revised scripts/*.def to reflect functions actually exported by libpng. - Updated the copyright year in scripts/pngw32.rc from 2004 to 2009. - Moved descriptions of makefiles and other scripts out of INSTALL into - scripts/README.txt - Rebuilt the configure scripts with autoconf-2.65 - Disabled the new pedantic warnings about deprecated function use and - deprecated structure access unless the user defines PNG_PEDANTIC_WARNINGS. - Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. - Updated the list of files and made some cosmetic changes in README. + libpng-1.0.52rc01-README.txt + libpng-1.0.52rc01-KNOWNBUGS.txt + libpng-1.0.52rc01-LICENSE.txt + libpng-1.0.52rc01-Y2K-compliance.txt + libpng-1.0.52rc01-[previous version]-diff.txt + +Changes since the last public release (1.0.51): + +version 1.2.42beta01 [December 4, 2009] + Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added + to pngconf.h in version 1.2.41. + Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco + to put png.h and pngconf.h in $prefix/include, like the other scripts, + instead of in $prefix/include/libpng. Also revised makefile.sco + to put them in $prefix/include/libpng%NN% instead of in + $prefix/include/libpng/libpng%NN%. + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin + +version 1.2.42beta02 [December 11, 2009] + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile + Relocated png_do_chop() to its original position in pngrtran.c. The + change in version 1.2.41beta08 caused transparency to be handled wrong + in some 16-bit datastreams (Yusaku Sugai). + +version 1.2.42rc01 [December 17, 2009] + No changes. + +version 1.2.42rc02 [December 22, 2009] + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising changes made in 1.2.41beta17 and 1.2.41rc01) + +version 1.0.52 and 1.2.42 [December 23, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net @@ -2591,9 +2591,34 @@ version 1.2.41rc03 [November 25, 2009] Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files. Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects. -version 1.2.41 [December 3, 2009] +version 1.2.41 and 1.0.51 [December 3, 2009] Updated the list of files and made some cosmetic changes in README. +version 1.2.42beta01 [December 4, 2009] + Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added + to pngconf.h in version 1.2.41. + Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco + to put png.h and pngconf.h in $prefix/include, like the other scripts, + instead of in $prefix/include/libpng. Also revised makefile.sco + to put them in $prefix/include/libpng10 instead of in + $prefix/include/libpng/libpng10. + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin + +version 1.2.42beta02 [December 11, 2009] + Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile + Relocated png_do_chop() to its original position in pngrtran.c. The + change in version 1.2.41beta08 caused transparency to be handled wrong + in some 16-bit datastreams (Yusaku Sugai). + +version 1.2.42rc01 [December 17, 2009] + No changes. + +version 1.2.42rc02 [December 22, 2009] + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising changes made in 1.2.41beta17 and 1.2.41rc01) + +version 1.0.52 and 1.2.42 [December 23, 2009] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.0.51 - December 3, 2009 +Installing libpng version 1.0.52rc01 - December 23, 2009 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.0.51" or "libpng10" and "zlib-1.2.3" +might be called "libpng-1.0.52rc01" or "libpng10" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -62,7 +62,7 @@ Your directory structure should look like this: configure.ac, configure, Makefile.am, Makefile.in, %12-% autogen.sh, config.guess, ltmain.sh, missing, %12-% aclocal.m4, config.h.in, config.sub, -%14+% autogen.sh, config.guess, ltmain.sh, missing, libpng-pc.in, +%14+% autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in, %14+% libpng-config.in, aclocal.m4, config.h.in, config.sub, depcomp, install-sh, mkinstalldirs, test-pngtest.sh contrib @@ -1,17 +1,24 @@ -Known bugs in libpng version 1.0.51 +Known bugs in libpng version 1.0.52rc01 -1. February 23, 2006: The custom makefiles don't build libpng with -lz. +1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently + defined in libpng-1.2.41/pngconf.h, which may cause a problem with + building a binary-compatible library. + + STATUS: This will be fixed in libpng-1.2.42. In the meantime, simply + delete the definition from line : + +2. February 23, 2006: The custom makefiles don't build libpng with -lz. STATUS: This is a subject of debate. The change will probably be made as a part of a major overhaul of the makefiles in libpng version 1.4.0. -2. February 24, 2006: The Makefile generated by the "configure" script +3. February 24, 2006: The Makefile generated by the "configure" script fails to install symbolic links libpng12.so => libpng12.so.0.1.2.9betaN that are generated by the custom makefiles. -3. September 4, 2007: There is a report that pngtest crashes on MacOS 10. +4. September 4, 2007: There is a report that pngtest crashes on MacOS 10. STATUS: workarounds are 1) Compile without optimization (crashes are observed with @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.51, December 3, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.0.52rc01, December 23, 2009, are Copyright (c) 2004, 2006-2009 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 -December 3, 2009 +December 23, 2009 diff --git a/Makefile.am b/Makefile.am index 49bef27df..bf6f0ae7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.51.txt pngvcrd.c + example.c libpng-1.0.52rc01.txt pngvcrd.c CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 3691d0f90..6220cb217 100644 --- a/Makefile.in +++ b/Makefile.in @@ -351,7 +351,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.51.txt pngvcrd.c + example.c libpng-1.0.52rc01.txt pngvcrd.c CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.0.51 - December 3, 2009 (shared library 10.0) +README for libpng version 1.0.52rc01 - December 23, 2009 (shared library 10.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -199,11 +199,11 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF gcc makefile symbol versioning, - creates libpng10.so.0.1.0.51) + creates libpng10.so.0.1.0.52rc01) makefile.linux => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.51) + libpng10.so.0.1.0.52rc01) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.51, previously + libpng10.so.0.1.0.52rc01, previously used assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static @@ -228,12 +228,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng10.so.0.1.0.51) + (gcc, creates libpng10.so.0.1.0.52rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.51) + (gcc, creates libpng10.so.0.1.0.52rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.51) + (gcc, creates libpng10.so.0.1.0.52rc01) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - December 3, 2009 + December 23, 2009 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.0.51 are Y2K compliant. It is my belief that earlier + upward through 1.0.52rc01 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 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.0.51. +# Generated by GNU Autoconf 2.65 for libpng 1.0.52rc01. # # 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.0.51' -PACKAGE_STRING='libpng 1.0.51' +PACKAGE_VERSION='1.0.52rc01' +PACKAGE_STRING='libpng 1.0.52rc01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1435,7 +1435,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.0.51 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.52rc01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.0.51:";; + short | recursive ) echo "Configuration of libpng 1.0.52rc01:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.0.51 +libpng configure 1.0.52rc01 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2037,7 +2037,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.0.51, which was +It was created by libpng $as_me 1.0.52rc01, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2845,7 +2845,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.0.51' + VERSION='1.0.52rc01' cat >>confdefs.h <<_ACEOF @@ -2909,10 +2909,10 @@ fi -PNGLIB_VERSION=1.0.51 +PNGLIB_VERSION=1.0.52rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=51 +PNGLIB_RELEASE=52 @@ -12074,7 +12074,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.0.51, which was +This file was extended by libpng $as_me 1.0.52rc01, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12140,7 +12140,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.0.51 +libpng config.status 1.0.52rc01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9cc06c0a6..cd3d6dda2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.51], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.52rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.51 +PNGLIB_VERSION=1.0.52rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=51 +PNGLIB_RELEASE=52 dnl End of version number stuff diff --git a/libpng-1.0.51.txt b/libpng-1.0.52rc01.txt index de18de4fc..f918ca699 100644 --- a/libpng-1.0.51.txt +++ b/libpng-1.0.52rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.51 - December 3, 2009 + libpng version 1.0.52rc01 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 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.0.51 - December 3, 2009 + libpng versions 0.97, January 1998, through 1.0.52rc01 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -878,7 +878,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.0.51, not all possible expansions are supported. +As of libpng version 1.0.52rc01, 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 @@ -3066,17 +3066,19 @@ when there is only one macro being tested. We do not use the TAB character for indentation in the C sources. +Lines do not exceed 80 characters. + Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -December 3, 2009 +December 23, 2009 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.0.51 are Y2K compliant. It is my belief that earlier +upward through 1.0.52rc01 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 3, 2009" +.TH LIBPNG 3 "December 23, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.51 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52rc01 .SH SYNOPSIS \fI\fB @@ -821,7 +821,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.0.51 - December 3, 2009 + libpng version 1.0.52rc01 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.0.51 - December 3, 2009 + libpng versions 0.97, January 1998, through 1.0.52rc01 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1699,7 +1699,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.0.51, not all possible expansions are supported. +As of libpng version 1.0.52rc01, 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 @@ -3887,17 +3887,19 @@ when there is only one macro being tested. We do not use the TAB character for indentation in the C sources. +Lines do not exceed 80 characters. + Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -December 3, 2009 +December 23, 2009 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.0.51 are Y2K compliant. It is my belief that earlier +upward through 1.0.52rc01 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 @@ -4186,6 +4188,10 @@ the first widely used release: 1.2.41rc01-03 13 10241 12.so.0.41[.0] 1.0.51 10 10051 10.so.0.51[.0] 1.2.41 13 10241 12.so.0.41[.0] + 1.2.42beta01-02 13 10242 12.so.0.42[.0] + 1.2.42rc01-02 13 10242 12.so.0.42[.0] + 1.0.52 10 10052 10.so.0.52[.0] + 1.2.42 13 10242 12.so.0.42[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4241,7 +4247,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.51 - December 3, 2009: +Libpng version 1.0.52rc01 - December 23, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4264,7 +4270,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.51, December 3, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.0.52rc01, December 23, 2009, are Copyright (c) 2004,2006-2008 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 @@ -4363,7 +4369,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 3, 2009 +December 23, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 31f0106bc..28b237c1e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 3, 2009" +.TH LIBPNGPF 3 "December 23, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.51 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52rc01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "December 3, 2009" +.TH PNG 5 "December 23, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -17,7 +17,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_51 Your_png_h_is_not_version_1_0_51; +typedef version_1_0_52rc01 Your_png_h_is_not_version_1_0_52rc01; /* Version information for C files. This had better match the version * string defined in png.h. @@ -723,13 +723,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.0.51 - December 3, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.0.52rc01 - December 23, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 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.0.51 - December 3, 2009\ + return ((png_charp) "libpng version 1.0.52rc01 - December 23, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.51 - December 3, 2009 + * libpng version 1.0.52rc01 - December 23, 2009 * Copyright (c) 1998-2009 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.) @@ -10,7 +10,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.0.51 - December 3, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.0.52rc01 - December 23, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -250,6 +250,10 @@ * 1.2.41rc01-03 13 10241 12.so.0.41[.0] * 1.0.51 10 10051 10.so.0.51[.0] * 1.2.41 13 10241 12.so.0.41[.0] + * 1.2.42beta01-02 13 10242 12.so.0.42[.0] + * 1.2.42rc01-02 13 10242 12.so.0.42[.0] + * 1.0.52 10 10052 10.so.0.52[.0] + * 1.2.42 13 10242 12.so.0.42[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -281,7 +285,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.51, December 3, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.52rc01, December 23, 2009, are * Copyright (c) 2004, 2006-2009 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: @@ -393,13 +397,13 @@ * Y2K compliance in libpng: * ========================= * - * December 3, 2009 + * December 23, 2009 * * 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.0.51 are Y2K compliant. It is my belief that earlier + * upward through 1.0.52rc01 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 @@ -455,9 +459,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.51" +#define PNG_LIBPNG_VER_STRING "1.0.52rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.51 - December 3, 2009\n" + " libpng version 1.0.52rc01 - December 23, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -465,12 +469,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 0 -#define PNG_LIBPNG_VER_RELEASE 51 +#define PNG_LIBPNG_VER_RELEASE 52 /* 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 @@ -487,7 +491,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_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -495,7 +499,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 10051 /* 1.0.51 */ +#define PNG_LIBPNG_VER 10052 /* 1.0.52 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1526,7 +1530,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_0_51; +typedef png_structp version_1_0_52rc01; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.51 - December 3, 2009 + * libpng version 1.0.52rc01 - December 23, 2009 * Copyright (c) 1998-2009 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.) @@ -758,7 +758,6 @@ #endif /* PNG_WRITE_SUPPORTED */ -#define PNG_NO_ERROR_NUMBERS #ifndef PNG_1_0_X # ifndef PNG_NO_ERROR_NUMBERS # define PNG_ERROR_NUMBERS_SUPPORTED diff --git a/pngerror.c b/pngerror.c index 18de775a8..d4522af69 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/pngpread.c b/pngpread.c index 9d0d7db39..83bad1d8f 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/pngrtran.c b/pngrtran.c index 198a93aa8..9805c39cc 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1437,11 +1437,6 @@ png_do_read_transformations(png_structp png_ptr) png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1); #endif -#ifdef PNG_READ_16_TO_8_SUPPORTED - if (png_ptr->transformations & PNG_16_TO_8) - png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); -#endif - #ifdef PNG_READ_BACKGROUND_SUPPORTED if ((png_ptr->transformations & PNG_BACKGROUND) && ((png_ptr->num_trans != 0 ) || @@ -1471,6 +1466,11 @@ png_do_read_transformations(png_structp png_ptr) png_ptr->gamma_shift); #endif +#ifdef PNG_READ_16_TO_8_SUPPORTED + if (png_ptr->transformations & PNG_16_TO_8) + png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1); +#endif + #ifdef PNG_READ_DITHER_SUPPORTED if (png_ptr->transformations & PNG_DITHER) { diff --git a/pngrutil.c b/pngrutil.c index ec10f8099..872638707 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1690,4 +1690,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_51 your_png_h_is_not_version_1_0_51; +typedef version_1_0_52rc01 your_png_h_is_not_version_1_0_52rc01; diff --git a/pngtrans.c b/pngtrans.c index 6ad9dcf62..17d7ccc14 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/pngwrite.c b/pngwrite.c index ddbff82bf..b0da05138 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/pngwtran.c b/pngwtran.c index e5bd4a3ad..a1bc3adc8 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/pngwutil.c b/pngwutil.c index 39884470b..831d8e6fb 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.41 [December 3, 2009] + * Last changed in libpng 1.2.41 [December 23, 2009] * Copyright (c) 1998-2009 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.) diff --git a/projects/wince.txt b/projects/wince.txt index 2f8ec0c92..e66bd2e06 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.0.51-project-wince.zip from a libpng distribution +libpng-1.0.52rc01-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net/index.html Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.0.51-project-wince.zip" +"unzip -a libpng-1.0.52rc01-project-wince.zip" diff --git a/scripts/README.txt b/scripts/README.txt index b1eba9df0..2a02f4988 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.0.51 - December 3, 2009 +Makefiles for libpng version 1.0.52rc01 - December 23, 2009 makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.51) + (gcc, creates libpng10.so.0.1.0.52rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -20,7 +20,7 @@ Makefiles for libpng version 1.0.51 - December 3, 2009 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.51) + gcc, creates libpng10.so.0.1.0.52rc01) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.gccmmx => Generic gcc makefile previously using MMX code @@ -38,14 +38,14 @@ Makefiles for libpng version 1.0.51 - December 3, 2009 makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng10.so.0.1.0.51) + creates libpng10.so.0.1.0.52rc01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.51) + creates libpng10.so.0.1.0.52rc01) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng10.so.0.1.0.51) + creates libpng10.so.0.1.0.52rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.51) + creates libpng10.so.0.1.0.52rc01) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index ae49cfaf1..0e334d529 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.0.51 +version=1.0.52rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index e5274d384..0a596f0f2 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.51 +Version: 1.0.52rc01 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index de2117356..fb2e073ff 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index f5391d97d..c286b2388 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index d6ba8186d..4514eb291 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index e91ec0a0a..54ed626af 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index 1fe526015..5247ca65f 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 0 -VERMIC = 51 +VERMIC = 52 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 57cdb6a4b..86e0fbf04 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 088251a3c..be9c31dab 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -42,7 +42,7 @@ RANLIB=ranlib RM_F=/bin/rm -f # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE -CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops +CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng10 -lz INCPATH=$(prefix)/include diff --git a/scripts/makefile.dec b/scripts/makefile.dec index a9a5d6583..6ba369330 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index e32bfaf49..8bd2ff64b 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 1f69ca2cb..9d69c09ea 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index cf6002c05..81b00e9bd 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index b24df8c06..1ea581579 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 9081517f4..9a1c65376 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index ab4ab55e6..111ed83ed 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 9e89338d8..bbe2ebd89 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index c06ba0ba0..f0f5b03eb 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png10 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.51 +SHLIB_MINOR= 1.0.52rc01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index fa275ed1b..1224ca5d3 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -2,22 +2,22 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007, 2009 Glenn Randers-Pehrson +# Copyright (C) 2007-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 -# You should also run makefile.ne0bsd +# You should also run makefile.ne10bsd LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man -INCSDIR=${LOCALBASE}/include/libpng +INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.0.51 +SHLIB_MINOR= 1.0.52rc01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 3577caba3..536d1a422 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 4f97bc4b1..ec681b364 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -1,6 +1,6 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# Copyright (C) 2007-2008 Glenn Randers-Pehrson +# Copyright (C) 2007-2009 Glenn Randers-Pehrson # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.51 +SHLIB_MINOR= 1.0.52rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ @@ -42,7 +42,7 @@ test: pngtest beforeinstall: if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \ - ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \ + ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \ fi if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \ @@ -67,7 +67,7 @@ afterinstall: @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ - -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng + -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 51bf48d48..27802d29e 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -44,7 +44,7 @@ ZLIBINC=../zlib CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE LDFLAGS=-L. -L$(ZLIBLIB) -lpng10 -lz -lm -INCPATH=$(prefix)/include/libpng +INCPATH=$(prefix)/include LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man BINPATH=$(exec_prefix)/bin diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 7e3bf4786..804068fac 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index ad495a607..fb95eaff2 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index d702d3f98..e097cade8 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index d7492c3c9..003074b10 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 106af25c5..77dba17a5 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.51 +PNGMIN = 1.0.52rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index b1db2688b..186e41d10 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.51 +;Version 1.0.52rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index b1d400e11..90f403411 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.51 +; Version 1.0.52rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index e6b728726..0e285dc4e 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.51 +;Version 1.0.52rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |