diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-06-18 11:58:02 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:26:37 -0500 |
| commit | 073070791a94bc049ec4e5e5ae8370cf203457ae (patch) | |
| tree | 9f12b6285c19c7608bf46215a32e12b047fef19d | |
| parent | 4049c1ac2a79b2ea9b1f4a5bead684f6c8ada8da (diff) | |
| download | libpng-073070791a94bc049ec4e5e5ae8370cf203457ae.tar.gz | |
[libpng10] Imported from libpng-1.0.46.tarv1.0.46
67 files changed, 157 insertions, 169 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.45 - June 4, 2009 +Libpng 1.0.46 - June 18, 2009 This is a public release of libpng, intended for use in production codes. @@ -8,60 +8,44 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.0.45.tar.gz - libpng-1.0.45.tar.lzma + libpng-1.0.46.tar.gz + libpng-1.0.46.tar.lzma (Get the lzma codec from <http://tukaani.org/lzma>). - libpng-1.0.45.tar.bz2 + libpng-1.0.46.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.45-no-config.tar.gz - libpng-1.0.45-no-config.tar.lzma - libpng-1.0.45-no-config.tar.bz2 + libpng-1.0.46-no-config.tar.gz + libpng-1.0.46-no-config.tar.lzma + libpng-1.0.46-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1045.zip - lpng1045.7z - lpng1045.tar.bz2 + lpng1046.zip + lpng1046.7z + lpng1046.tar.bz2 Project files - libpng-1.0.45-project-netware.zip - libpng-1.0.45-project-wince.zip + libpng-1.0.46-project-netware.zip + libpng-1.0.46-project-wince.zip Other information: - libpng-1.0.45-README.txt - libpng-1.0.45-KNOWNBUGS.txt - libpng-1.0.45-LICENSE.txt - libpng-1.0.45-Y2K-compliance.txt - -Changes since the last public release (1.0.44): - -version 1.0.45 [June 4, 2009] - - Fixed inconsistency in pngrutil.c, introduced in libpng-1.2.36. The - memset() was using "png_ptr->rowbytes" instead of "row_bytes", which - the corresponding png_malloc() uses (Joe Drew). - Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri) - Updated some of the makefiles in the scripts directory. - Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG) - Relocated misplaced #endif in pngwrite.c, sCAL chunk handler. - Conditionally compile png_read_finish_row() which is not used by - progressive readers. - Added contrib/pngminim/preader to demonstrate building minimal progressive - decoder, based on contrib/gregbook with embedded libpng and zlib. - In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there - is only one makefile in those directories, and revised the README files - accordingly. - Reformated sources in libpng style (3-space indentation, comment format) - Added sections about the git repository and our coding style to the - documentation (merged from libpng-1.4.0beta62) - Added a section about using png_get_io_ptr() in configure scripts to detect - the presence of libpng. + libpng-1.0.46-README.txt + libpng-1.0.46-KNOWNBUGS.txt + libpng-1.0.46-LICENSE.txt + libpng-1.0.46-Y2K-compliance.txt + +Changes since the last public release (1.0.45): + +version 1.0.46 [June 18, 2009] + + Fixed a mistake in the editing script that changes the scripts files + to version 1.0.x, which created an erroneous libpng.pc and some makefiles. + The error was introduced in libpng-1.0.45. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2382,7 +2382,7 @@ version 1.2.37beta03 [May 20, 2009] version 1.2.37rc01 [May 27, 2009] No changes. -versions 1.2.37 and 1.0.45 [June 4, 2009] +versions 1.2.37 and 1.0.45 [June 17, 2009] Reformatted several remaining "else statement;" and "if () statment;" into two lines. Added "#define PNG_NO_WRITE_SWAP" to contrib/pngminim/encoder/pngusr.h @@ -2392,6 +2392,11 @@ versions 1.2.37 and 1.0.45 [June 4, 2009] Added a section about using png_get_io_ptr() in configure scripts to detect the presence of libpng. +version 1.0.46 [June 18, 2009] + Fixed a mistake in the editing script that changes the scripts files + to version 1.0.x, which created an erroneous libpng.pc and some makefiles. + The error was introduced in libpng-1.0.45. + 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.45 - June 4, 2009 +Installing libpng version 1.0.46 - June 18, 2009 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,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.45" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.0.46" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.45) + gcc, creates libpng10.so.0.1.0.46) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.45) + (gcc, creates libpng10.so.0.1.0.46) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng10.so.0.1.0.45) + creates libpng10.so.0.1.0.46) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.45) + creates libpng10.so.0.1.0.46) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng10.so.0.1.0.45) + creates libpng10.so.0.1.0.46) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.45) + creates libpng10.so.0.1.0.46) 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,5 +1,5 @@ -Known bugs in libpng version 1.0.45 +Known bugs in libpng version 1.0.46 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.0.45, June 4, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.0.46, June 18, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 4, 2009 +June 18, 2009 diff --git a/Makefile.am b/Makefile.am index fd4d61647..5e490b750 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.45.txt pngvcrd.c + example.c libpng-1.0.46.txt pngvcrd.c CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index f1278e099..b1277a29b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -333,7 +333,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.45.txt pngvcrd.c + example.c libpng-1.0.46.txt pngvcrd.c CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.0.45 - June 4, 2009 (shared library 10.0) +README for libpng version 1.0.46 - June 18, 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. @@ -194,11 +194,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.45) + gcc, creates libpng10.so.0.1.0.46) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.45) + (gcc, creates libpng10.so.0.1.0.46) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.45, + (gcc, creates libpng10.so.0.1.0.46, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -220,12 +220,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.45) + (gcc, creates libpng10.so.0.1.0.46) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.45) + (gcc, creates libpng10.so.0.1.0.46) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.45) + (gcc, creates libpng10.so.0.1.0.46) 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: ========================= - June 4, 2009 + June 18, 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.45 are Y2K compliant. It is my belief that earlier + upward through 1.0.46 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.62 for libpng 1.0.45. +# Generated by GNU Autoconf 2.62 for libpng 1.0.46. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.0.45' -PACKAGE_STRING='libpng 1.0.45' +PACKAGE_VERSION='1.0.46' +PACKAGE_STRING='libpng 1.0.46' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1484,7 +1484,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.45 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.46 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1554,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.0.45:";; + short | recursive ) echo "Configuration of libpng 1.0.46:";; esac cat <<\_ACEOF @@ -1661,7 +1661,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.0.45 +libpng configure 1.0.46 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1675,7 +1675,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.45, which was +It was created by libpng $as_me 1.0.46, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2389,7 +2389,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.0.45' + VERSION='1.0.46' cat >>confdefs.h <<_ACEOF @@ -2558,10 +2558,10 @@ fi -PNGLIB_VERSION=1.0.45 +PNGLIB_VERSION=1.0.46 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=45 +PNGLIB_RELEASE=46 @@ -13125,7 +13125,7 @@ exec 6>&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.45, which was +This file was extended by libpng $as_me 1.0.46, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13178,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.0.45 +libpng config.status 1.0.46 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 669a2a8fb..582b0de7d 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.45], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.46], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.45 +PNGLIB_VERSION=1.0.46 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=45 +PNGLIB_RELEASE=46 dnl End of version number stuff @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.0.45.txt b/libpng-1.0.46.txt index 17ef693e7..3d839dc43 100644 --- a/libpng-1.0.45.txt +++ b/libpng-1.0.46.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.45 - June 4, 2009 + libpng version 1.0.46 - June 18, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.0.45 - June 4, 2009 + libpng versions 0.97, January 1998, through 1.0.46 - June 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -2944,13 +2944,13 @@ source. XIII. Y2K Compliance in libpng -June 4, 2009 +June 18, 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.45 are Y2K compliant. It is my belief that earlier +upward through 1.0.46 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 "June 4, 2009" +.TH LIBPNG 3 "June 18, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.45 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.46 .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.45 - June 4, 2009 + libpng version 1.0.46 - June 18, 2009 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -830,7 +830,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.0.45 - June 4, 2009 + libpng versions 0.97, January 1998, through 1.0.46 - June 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3765,13 +3765,13 @@ source. .SH XIII. Y2K Compliance in libpng -June 4, 2009 +June 18, 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.45 are Y2K compliant. It is my belief that earlier +upward through 1.0.46 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 @@ -4040,6 +4040,8 @@ the first widely used release: 1.2.37beta01-03 13 10237 12.so.0.37[.0] 1.2.37rc01 13 10237 12.so.0.37[.0] 1.2.37 13 10237 12.so.0.37[.0] + 1.0.45 10 10045 10.so.0.45[.0] + 1.0.46 10 10046 10.so.0.46[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4095,7 +4097,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.45 - June 4, 2009: +Libpng version 1.0.46 - June 18, 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). @@ -4116,7 +4118,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.0.45, June 4, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.0.46, June 18, 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 @@ -4215,7 +4217,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 4, 2009 +June 18, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 5bda87c93..3e1e173e8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 4, 2009" +.TH LIBPNGPF 3 "June 18, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.45 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.46 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "June 4, 2009" +.TH PNG 5 "June 18, 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_45 Your_png_h_is_not_version_1_0_45; +typedef version_1_0_46 Your_png_h_is_not_version_1_0_46; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -702,7 +702,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.0.45 - June 4, 2009\n\ + return ((png_charp) "\n libpng version 1.0.46 - June 18, 2009\n\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.45 - June 4, 2009 + * libpng version 1.0.46 - June 18, 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.) @@ -8,7 +8,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.45 - June 4, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.0.46 - June 18, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -229,6 +229,8 @@ * 1.2.37beta01-03 13 10237 12.so.0.37[.0] * 1.2.37rc01 13 10237 12.so.0.37[.0] * 1.2.37 13 10237 12.so.0.37[.0] + * 1.0.45 10 10045 10.so.0.45[.0] + * 1.0.46 10 10046 10.so.0.46[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -258,7 +260,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.45, June 4, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.46, June 18, 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: @@ -370,13 +372,13 @@ * Y2K compliance in libpng: * ========================= * - * June 4, 2009 + * June 18, 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.45 are Y2K compliant. It is my belief that earlier + * upward through 1.0.46 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 @@ -432,9 +434,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.45" +#define PNG_LIBPNG_VER_STRING "1.0.46" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.45 - June 4, 2009\n" + " libpng version 1.0.46 - June 18, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -442,7 +444,7 @@ /* 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 45 +#define PNG_LIBPNG_VER_RELEASE 46 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ @@ -470,7 +472,7 @@ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * 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 10045 /* 1.0.45 */ +#define PNG_LIBPNG_VER 10046 /* 1.0.46 */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -1494,7 +1496,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_45; +typedef png_structp version_1_0_46; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.45 - June 4, 2009 + * libpng version 1.0.46 - June 18, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index d395d2928..87670b472 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 9746c7a06..8259dc93d 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index af396df07..8d24d9c33 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index ae1e3f78a..89c3b64a4 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1686,4 +1686,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_45 your_png_h_is_not_version_1_0_45; +typedef version_1_0_46 your_png_h_is_not_version_1_0_46; @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index bd6263c21..e3fb04824 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index ac563390c..e82d16786 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.37 [June 4, 2009] + * Last changed in libpng 1.2.37 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 22a83ccb0..3d948dd4e 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.36 [June 4, 2009] + * Last changed in libpng 1.2.36 [June 18, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index afb27f181..f8670bf33 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -6,7 +6,7 @@ project(PNG) set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 0) -set(PNGLIB_RELEASE 45) +set(PNGLIB_RELEASE 46) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.0.45 +# VERSION 0.${PNGLIB_RELEASE}.1.0.46 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index a1d69faa4..18577bf82 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.45 +version=1.0.46 prefix="" libdir="" libs="" diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in index 867832028..2f475be5d 100755 --- a/scripts/libpng-config.in +++ b/scripts/libpng-config.in @@ -19,8 +19,7 @@ I_opts="-I${includedir}" L_opts="-L${libdir}" R_opts="" cppflags="" -%12-%ccopts="@LIBPNG_NO_MMX@" -%14+%ccopts="" +ccopts="@LIBPNG_NO_MMX@" ldopts="" usage() diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 6de64ffa6..cadb55502 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -8,5 +8,4 @@ Description: Loads and saves PNG files Version: @PNGLIB_VERSION@ Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ Libs.private: @LIBS@ -%12-%Cflags: -I${includedir} @LIBPNG_NO_MMX@ -%14+%Cflags: -I${includedir} +Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index e0441b46e..5616ee22f 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.45 +Version: 1.0.46 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 6be3796a9..9c36122db 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 96ccc4c37..eb2b71b0b 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 22a076988..b7da3dc1f 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 12180797f..64633e6ca 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 08cc56611..6e0852b87 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4d2f385b7..91b8c453b 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 4b1a9bb1a..a4259a34c 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a4bea958b..c1da5760b 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -13,7 +13,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 7a78b31a8..f10f1e643 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -3,8 +3,7 @@ # For conditions of distribution and use, see copyright notice in png.h PREFIX?= /usr/local -%12-%SHLIB_VER?= 5 -%14+%SHLIB_VER?= %SONUM% +SHLIB_VER?= 5 LIB= png SHLIB_MAJOR= ${SHLIB_VER} @@ -26,9 +25,9 @@ LDADD+= -lm -lz DPADD+= ${LIBM} ${LIBZ} CFLAGS+= -I. -%12-%.if (${MACHINE_ARCH} != "i386") -%12-%CFLAGS+= -DPNG_NO_MMX_CODE -%12-%.endif +.if (${MACHINE_ARCH} != "i386") +CFLAGS+= -DPNG_NO_MMX_CODE +.endif SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index ba47b5fca..6c82f030f 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index cf616141b..b59f323ff 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index fbc1c3a39..3f7e8a873 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 5e69d0163..d169c9184 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 172a1ea67..a36e8992d 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 93e71dc11..74150b0cb 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 893358f8b..a3cb48486 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png10 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.45 +SHLIB_MINOR= 1.0.46 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 04ae59a0a..0b0d3840e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.0.45 +SHLIB_MINOR= 1.0.46 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 cf736f094..d0c3ed239 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 5f7a90cd9..b84bdaa6f 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.45 +SHLIB_MINOR= 1.0.46 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 8ef845823..5df2ff209 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 599ac565d..c6b7ea175 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 35b8c7afc..1f8ab296d 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 64c847149..84bfe25a9 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index ac7af5e98..cfe84dfe8 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 1f75553cf..99427d7bf 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.45 +PNGMIN = 1.0.46 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 04bdf4c3e..0966711d3 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -6,14 +6,13 @@ # To use, do "nmake /f scripts\makefile.vcawin32" # -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- -%12-%# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. +# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. # Compiler, linker, librarian, and other tools CC = cl LD = link AR = lib -%12-%CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib -%14+%CFLAGS = -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index 01c83b500..81842321c 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -6,14 +6,13 @@ # To use, do "nmake /f scripts\makefile.vcwin32" # -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- -%12-%# If you want to use assembler (MMX) code, use makefile.vcawin32 instead. +# If you want to use assembler (MMX) code, use makefile.vcawin32 instead. # Compiler, linker, librarian, and other tools CC = cl LD = link AR = lib -%12-%CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib -%14+%CFLAGS = -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e312ecf3d..5fef1c902 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.45 +; Version 1.0.46 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index bdf76745f..0f82bc909 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.45 +;Version 1.0.46 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |