diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-06-19 19:05:48 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:13:36 -0500 |
| commit | 06fe17eb9fbc4dd03afb7b198ba260e16568e9a4 (patch) | |
| tree | 2ff1c1202ebebd0826bfaf04805a0c0803cf2dc5 | |
| parent | 7945bdb88fa3a3d97646a11705cba60a79be0a4f (diff) | |
| download | libpng-06fe17eb9fbc4dd03afb7b198ba260e16568e9a4.tar.gz | |
Imported from libpng-1.2.19beta17.tarv1.2.19beta17
58 files changed, 198 insertions, 206 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.19beta16 - June 19, 2007 +Libpng 1.2.19beta17 - June 20, 2007 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. @@ -9,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.19beta16.tar.gz - libpng-1.2.19beta16.tar.bz2 + libpng-1.2.19beta17.tar.gz + libpng-1.2.19beta17.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19beta16-no-config.tar.gz - libpng-1.2.19beta16-no-config.tar.bz2 + libpng-1.2.19beta17-no-config.tar.gz + libpng-1.2.19beta17-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219b16.zip - lp1219b16.tar.bz2 + lp1219b17.zip + lp1219b17.tar.bz2 Project files - libpng-1.2.19beta16-project-netware.zip - libpng-1.2.19beta16-project-wince.zip + libpng-1.2.19beta17-project-netware.zip + libpng-1.2.19beta17-project-wince.zip Other information: - libpng-1.2.19beta16-README.txt - libpng-1.2.19beta16-KNOWNBUGS.txt - libpng-1.2.19beta16-LICENSE.txt - libpng-1.2.19beta16-Y2K-compliance.txt + libpng-1.2.19beta17-README.txt + libpng-1.2.19beta17-KNOWNBUGS.txt + libpng-1.2.19beta17-LICENSE.txt + libpng-1.2.19beta17-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -97,12 +97,16 @@ version 1.2.19beta14 [June 16, 2007] version 1.2.19beta15 [June 17, 2007] Revised pnggccrd.c. -version 1.2.19beta16 [June 19, 2007] +version 1.2.19beta16 [June 18, 2007] Revised pnggccrd.c again. Updated contrib/gregbook. - Changed '#include "$srcdir/pnggccrd.c"' 'include "$srcdir/pnggccrd.c"' + Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"' in configure.ac +version 1.2.19beta17 [June 20, 2007] + Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed + and to not use -O3 unless -DPNG_NO_MMX_CODE is also set. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1790,12 +1790,16 @@ version 1.2.19beta14 [June 16, 2007] version 1.2.19beta15 [June 17, 2007] Revised pnggccrd.c. -version 1.2.19beta16 [June 19, 2007] +version 1.2.19beta16 [June 18, 2007] Revised pnggccrd.c again. Updated contrib/gregbook. - Changed '#include "$srcdir/pnggccrd.c"' 'include "$srcdir/pnggccrd.c"' + Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"' in configure.ac +version 1.2.19beta17 [June 20, 2007] + Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed + and to not use -O3 unless -DPNG_NO_MMX_CODE is also set. + 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.2.19beta16 - June 19, 2007 +Installing libpng version 1.2.19beta17 - June 20, 2007 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.2.19beta16" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19beta17" 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,14 +101,14 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.19beta16) + gcc, creates libpng12.so.0.1.2.19beta17) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta16) + (gcc, creates libpng12.so.0.1.2.19beta17) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta16, + (gcc, creates libpng12.so.0.1.2.19beta17, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta16 + (gcc, creates libpng12.so.0.1.2.19beta17 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -131,14 +131,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.19beta16) + creates libpng12.so.0.1.2.19beta17) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta16) + creates libpng12.so.0.1.2.19beta17) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19beta16) + creates libpng12.so.0.1.2.19beta17) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19beta16) + creates libpng12.so.0.1.2.19beta17) 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 @@ -218,7 +218,7 @@ which previously was done semi-automatically (if you didn't edit scripts/makefile.* yourself, that is) -CFLAGS="-Wall -O3 -funroll-loops \ +CFLAGS="-Wall -O -funroll-loops \ -malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \ --with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.19beta16 +Known bugs in libpng version 1.2.19beta17 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -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.2.19beta16, June 19, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta17, June 20, 2007, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 19, 2007 +June 20, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.19beta16 - June 19, 2007 (shared library 12.0) +README for libpng version 1.2.19beta17 - June 20, 2007 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -190,11 +190,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 libpng12.so.0.1.2.19beta16) + gcc, creates libpng12.so.0.1.2.19beta17) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta16) + (gcc, creates libpng12.so.0.1.2.19beta17) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19beta16, + (gcc, creates libpng12.so.0.1.2.19beta17, 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 @@ -216,12 +216,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.19beta16) + (gcc, creates libpng12.so.0.1.2.19beta17) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19beta16) + (gcc, creates libpng12.so.0.1.2.19beta17) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19beta16) + (gcc, creates libpng12.so.0.1.2.19beta17) 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 19, 2007 + June 20, 2007 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.2.19beta16 are Y2K compliant. It is my belief that earlier + upward through 1.2.19beta17 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.61 for libpng 1.2.19beta16. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19beta17. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.19beta16' -PACKAGE_STRING='libpng 1.2.19beta16' +PACKAGE_VERSION='1.2.19beta17' +PACKAGE_STRING='libpng 1.2.19beta17' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1405,7 +1405,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.2.19beta16 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19beta17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.19beta16:";; + short | recursive ) echo "Configuration of libpng 1.2.19beta17:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.19beta16 +libpng configure 1.2.19beta17 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1599,7 +1599,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.2.19beta16, which was +It was created by libpng $as_me 1.2.19beta17, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2269,7 +2269,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.19beta16' + VERSION='1.2.19beta17' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19beta16 +PNGLIB_VERSION=1.2.19beta17 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 @@ -21119,7 +21119,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.2.19beta16, which was +This file was extended by libpng $as_me 1.2.19beta17, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21172,7 +21172,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.19beta16 +libpng config.status 1.2.19beta17 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index e4b315550..a375a13ce 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.19beta16], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19beta17], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19beta16 +PNGLIB_VERSION=1.2.19beta17 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19beta16.txt b/libpng-1.2.19beta17.txt index 27de89055..a9e298517 100644 --- a/libpng-1.2.19beta16.txt +++ b/libpng-1.2.19beta17.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19beta16 - June 19, 2007 + libpng version 1.2.19beta17 - June 20, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2921,13 +2921,13 @@ application: IX. Y2K Compliance in libpng -June 19, 2007 +June 20, 2007 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.2.19beta16 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta17 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 19, 2007" +.TH LIBPNG 3 "June 20, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta17 .SH SYNOPSIS \fB #include <png.h>\fP @@ -410,7 +410,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.2.19beta16 - June 19, 2007 + libpng version 1.2.19beta17 - June 20, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3331,13 +3331,13 @@ application: .SH IX. Y2K Compliance in libpng -June 19, 2007 +June 20, 2007 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.2.19beta16 are Y2K compliant. It is my belief that earlier +upward through 1.2.19beta17 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 @@ -3526,7 +3526,7 @@ the first widely used release: 1.2.17 13 10217 12.so.0.17[.0] 1.0.26 10 10026 10.so.0.26[.0] 1.2.18 13 10218 12.so.0.18[.0] - 1.2.19beta1-16 13 10219 12.so.0.19[.0] + 1.2.19beta1-17 13 10219 12.so.0.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3582,7 +3582,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.19beta16 - June 19, 2007: +Libpng version 1.2.19beta17 - June 20, 2007: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3603,7 +3603,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.2.19beta16, June 19, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19beta17, June 20, 2007, 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 @@ -3702,7 +3702,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 19, 2007 +June 20, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index cff8f057d..0e6a9fcb2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "June 19, 2007" +.TH LIBPNGPF 3 "June 20, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19beta17 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "June 19, 2007" +.TH PNG 5 "June 20, 2007" .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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 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_2_19beta16 Your_png_h_is_not_version_1_2_19beta16; +typedef version_1_2_19beta17 Your_png_h_is_not_version_1_2_19beta17; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -706,7 +706,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.2.19beta16 - June 19, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19beta17 - June 20, 2007\n\ Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19beta16 - June 19, 2007 + * libpng version 1.2.19beta17 - June 20, 2007 * Copyright (c) 1998-2007 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.) @@ -9,7 +9,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.2.19beta16 - June 19, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19beta17 - June 20, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -150,7 +150,7 @@ * 1.2.17 13 10217 12.so.0.17[.0] * 1.0.26 10 10026 10.so.0.26[.0] * 1.2.18 13 10218 12.so.0.18[.0] - * 1.2.19beta1-16 13 10219 12.so.0.19[.0] + * 1.2.19beta1-17 13 10219 12.so.0.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -180,7 +180,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta16, June 19, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19beta17, June 20, 2007, 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: @@ -292,13 +292,13 @@ * Y2K compliance in libpng: * ========================= * - * June 19, 2007 + * June 20, 2007 * * 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.2.19beta16 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19beta17 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 @@ -354,9 +354,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.19beta16" +#define PNG_LIBPNG_VER_STRING "1.2.19beta17" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19beta16 - June 19, 2007 (header)\n" + " libpng version 1.2.19beta17 - June 20, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -368,7 +368,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 16 +#define PNG_LIBPNG_VER_BUILD 17 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1407,7 +1407,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_2_19beta16; +typedef png_structp version_1_2_19beta17; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19beta16 - June 19, 2007 + * libpng version 1.2.19beta17 - June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 52c05e3ff..0f6170870 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 391b540d7..03ced6d73 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -3,7 +3,7 @@ * * For Intel x86 CPU (Pentium-MMX or later) and GNU C compiler. * - * Last changed in libpng 1.2.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998 Intel Corporation * Copyright (c) 1999-2002,2007 Greg Roelofs diff --git a/pngpread.c b/pngpread.c index 2daa86ec6..746ab2e4c 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 7ada7fe52..102caba07 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 428c04bca..ab2168774 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1553,4 +1553,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_19beta16 your_png_h_is_not_version_1_2_19beta16; +typedef version_1_2_19beta17 your_png_h_is_not_version_1_2_19beta17; @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngwutil.c b/pngwutil.c index 89b200195..1605544e9 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.19 June 19, 2007 + * Last changed in libpng 1.2.19 June 20, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c30ad50a7..667d227b1 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -91,30 +91,21 @@ set(pngtest_sources add_definitions(-DZLIB_DLL) if(MSVC) - add_definitions(-DPNG_USE_PNGVCRD -DPNG_NO_MODULEDEF + add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE) set(libpng_sources ${libpng_sources} pngvcrd.c ) else(MSVC) - add_definitions(-DPNG_USE_PNGGCCRD) set(libpng_sources ${libpng_sources} pnggccrd.c ) endif(MSVC) -if(NOT MSVC) - if(NOT PNG_MMX) - add_definitions(-DLIBPNG_NO_MMX) - add_definitions(-DPNG_NO_MMX_CODE) - endif(NOT PNG_MMX) -else(NOT MSVC) - if(PNG_MMX) - # maybe add this to pngconf.h ? - add_definitions(-DPNG_MMX_CODE_SUPPORTED) - endif(PNG_MMX) -endif(NOT MSVC) - +if(NOT PNG_MMX) + add_definitions(-DLIBPNG_NO_MMX) + add_definitions(-DPNG_NO_MMX_CODE) +endif(NOT PNG_MMX) if(PNG_CONSOLE_IO_SUPPORTED) add_definitions(-DPNG_CONSOLE_IO_SUPPORTED) @@ -179,7 +170,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.2.19beta16 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19beta17 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 a49df6bb3..207f3eebd 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19beta16 +version=1.2.19beta17 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index f88a2b3f8..7f4ed5eae 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.19beta16 +Version: 1.2.19beta17 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 26a735a48..47425bdf5 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.19beta16 +Version: 1.2.19beta17 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 3fa44d49b..6a00d67f2 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e920a61f5..ed74a7f1b 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index abd7b853c..6de6ea8a0 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 510711cf2..7207e6cd3 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 152525b61..1da7b18f1 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -3,7 +3,7 @@ # of the library, and builds two copies of pngtest: one # statically linked and one dynamically linked. # -# Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson, +# Copyright (C) 2002, 2006, 2007 Soren Anderson, Charles Wilson, # and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by: # Copyright (C) 1998-2000 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger @@ -31,9 +31,8 @@ endif DESTDIR= -# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to -# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency -# list at the bottom of this makefile. +# To disable assembler optimizations, add '-DPNG_NO_MMX_CODE' to +# $CFLAGS. CC=gcc ifdef MINGW @@ -62,25 +61,23 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -### if you use the asm, add pnggccrd.o to the OBJS list -### ### if you don't need thread safety, but want the asm accel -#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \ -# $(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \ +#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +# $(addprefix -I,$(ZLIBINC)) -Wall -O $(ALIGN) -funroll-loops \ # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 ### if you need thread safety and want (minimal) asm accel -#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \ -# -Wall -O3 $(ALIGN) -funroll-loops \ +#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +# -Wall -O $(ALIGN) -funroll-loops \ # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 ### Normal (non-asm) compilation CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ - -Wall -O3 $(ALIGN) -funroll-loops \ + -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll @@ -115,7 +112,7 @@ DL =$(D)$(LIBPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o # pnggccrd.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -300,6 +297,7 @@ pngwio.o pngwio.pic.o: png.h pngconf.h pngwio.c pngmem.o pngmem.pic.o: png.h pngconf.h pngmem.c pngset.o pngset.pic.o: png.h pngconf.h pngset.c pngget.o pngget.pic.o: png.h pngconf.h pngget.c +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pnggccrd.c pngread.o pngread.pic.o: png.h pngconf.h pngread.c pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrtran.c pngrutil.o pngrutil.pic.o: png.h pngconf.h pngrutil.c diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index befc81f8a..dbdafd64d 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -38,7 +38,8 @@ LN_SF=ln -sf RANLIB=ranlib RM_F=/bin/rm -f -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops +# CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE +CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz INCPATH=$(prefix)/include @@ -63,7 +64,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -217,6 +218,7 @@ pngrio.o pngrio.pic.o: png.h pngconf.h pngwio.o pngwio.pic.o: png.h pngconf.h pngmem.o pngmem.pic.o: png.h pngconf.h pngset.o pngset.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngget.o pngget.pic.o: png.h pngconf.h pngread.o pngread.pic.o: png.h pngconf.h pngrtran.o pngrtran.pic.o: png.h pngconf.h diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 1cc5ebeaa..3454cd292 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 6674d6f98..fd1611945 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 7821e3817..dbaf7fc01 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -24,7 +24,7 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ LDADD+= -lm -lz DPADD+= ${LIBM} ${LIBZ} -CFLAGS+= -I. -DPNG_USE_PNGGCCRD +CFLAGS+= -I. .if (${MACHINE_ARCH} != "i386") CFLAGS+= -DPNG_NO_MMX_CODE .endif diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 10018ac79..92af36766 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -60,15 +60,15 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety ### for generic gcc: -CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \ - -O3 $(ALIGN) -funroll-loops \ +CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \ + $(ALIGN) -funroll-loops \ -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5 ### for gcc 2.95.2 on 686: -#CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \ +#CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \ # -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \ # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer ### for gcc 2.7.2.3 on 486 and up: -#CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \ +#CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \ # -m486 -malign-double -ffast-math \ # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer @@ -120,7 +120,7 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \ + echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index d3d012b3d..b0aeb4fb1 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index a18bcaf01..0d3a29b64 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -1,5 +1,5 @@ # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker. -# Copyright (C) 2002, 2006 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2007 Glenn Randers-Pehrson # Copyright (C) 2001, Laurent faillie # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -53,7 +53,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 #LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm @@ -80,7 +80,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -237,5 +237,6 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 9891762c0..d3bb7e2b5 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -45,7 +45,7 @@ LIBPATH=$(exec_prefix)/lib MANPATH=$(prefix)/man BINPATH=$(exec_prefix)/bin -CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 +CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -DPNG_NO_MMX_CODE # Caution: be sure you have built zlib with the same CFLAGS. CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm @@ -67,7 +67,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -226,3 +226,4 @@ pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pnggccrd.o: png.h pngconf.h diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 1cabe779b..a155ddd58 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -8,14 +8,6 @@ # To use, do "nmake /f scripts\makefile.intel" -# ------------------- Intel C/C++ Compiler 4.0 and later ------------------- - -# Caution: the assembler code was introduced at libpng version 1.0.4 and has -# not yet been thoroughly tested. - -# Use assembler code -ASMCODE=-DPNG_USE_PNGVCRD - # Where the zlib library and include files are located ZLIBLIB=..\zlib ZLIBINC=..\zlib @@ -36,7 +28,7 @@ CALLING=r # __fastcall CC=icl -c -CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) $(ASMCODE) -nologo +CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo LD=link LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO @@ -44,8 +36,7 @@ O=.obj OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \ pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \ -pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O) - +pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O) pnggccrd$(O) all: test @@ -70,6 +61,9 @@ pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) +pnggccrd$(O): png.h pngconf.h + $(CC) $(CFLAGS) $*.c $(ERRFILE) + pngvcrd$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) diff --git a/scripts/makefile.linux b/scripts/makefile.linux index c6ac9f6f9..73442884e 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -47,7 +47,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm @@ -75,7 +75,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -233,6 +233,7 @@ pngwio.o pngwio.pic.o: png.h pngconf.h pngmem.o pngmem.pic.o: png.h pngconf.h pngset.o pngset.pic.o: png.h pngconf.h pngget.o pngget.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngread.o pngread.pic.o: png.h pngconf.h pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrutil.o pngrutil.pic.o: png.h pngconf.h diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 81bb56e6b..0337afa44 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -40,9 +40,8 @@ RANLIB=ranlib MKDIR_P=/bin/mkdir -pv -# To enable assembler optimizations, add '-DPNG_USE_PNGGCCRD' to -# $CFLAGS, and include pnggccrd.o in $OBJS, below. - +# To disable assembler optimizations, add '-DPNG_NO_MMX_CODE' to +# $CFLAGS. # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h ifndef prefix @@ -63,25 +62,23 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -### if you use the asm, add pnggccrd.o to the OBJS list -### ### if you don't need thread safety, but want the asm accel -#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD \ -# $(addprefix -I,$(ZLIBINC)) -Wall -O3 $(ALIGN) -funroll-loops \ +#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +# $(addprefix -I,$(ZLIBINC)) -Wall -O $(ALIGN) -funroll-loops \ # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 ### if you need thread safety and want (minimal) asm accel -#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_USE_PNGGCCRD $(addprefix -I,$(ZLIBINC)) \ -# -Wall -O3 $(ALIGN) -funroll-loops \ +#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +# -Wall -O $(ALIGN) -funroll-loops \ # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 ### Normal (non-asm) compilation CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ - -Wall -O3 $(ALIGN) -funroll-loops \ + -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll @@ -112,7 +109,7 @@ DL =$(D)$(LIBPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o # pnggccrd.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f8ad3238e..fe410fde0 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,14 +14,14 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.19beta16 +SHLIB_MINOR= 1.2.19beta17 SRCS= pnggccrd.c 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 INCS= png.h pngconf.h MAN= libpng.3 libpngpf.3 png.5 -CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD +CPPFLAGS+=-I${.CURDIR} # something like this for mmx assembler, but it core dumps for me at the moment # .if ${MACHINE_ARCH} == "i386" diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 73c3ef7c9..7abd03aab 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,14 +14,14 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.19beta16 +SHLIB_MINOR= 1.2.19beta17 SRCS= pnggccrd.c 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 INCS= png.h pngconf.h MAN= libpng.3 libpngpf.3 png.5 -CPPFLAGS+=-I${.CURDIR} -DPNG_USE_PNGGCCRD +CPPFLAGS+=-I${.CURDIR} # something like this for mmx assembler, but it core dumps for me at the moment # .if ${MACHINE_ARCH} == "i386" diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 091b014e3..12638fc76 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -48,8 +48,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # for pgcc version 2.95.1, -O3 is buggy; don't use it. -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ - -DPNG_NO_MMX_CODE \ +CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm @@ -77,7 +76,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -244,5 +243,6 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 700e6a6a0..a34db0034 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.2.19beta16 +SHLIB_MINOR= 1.2.19beta17 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ @@ -18,7 +18,7 @@ SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ HDRS= png.h pngconf.h CFLAGS+= -Wall -CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE -DPNG_USE_PNGGCCRD +CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE NOPROFILE= Yes diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 02ae1f2e4..f2d983ec4 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -38,7 +38,7 @@ exec_prefix=$(prefix) ZLIBLIB=../zlib ZLIBINC=../zlib -CFLAGS= -dy -belf -I$(ZLIBINC) -O3 +CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm INCPATH=$(prefix)/include/libpng @@ -221,5 +221,6 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index bc4f45c1b..bdc722166 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -44,8 +44,7 @@ ZLIBINC=../zlib ABI= WARNMORE= # -g -DPNG_DEBUG=5 -CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 \ - -DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 -DPNG_NO_MMX_CODE LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ -set_version sgi$(PNGMAJ).0 @@ -94,7 +93,7 @@ libpng-config: echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"$(ABI)\"; \ - echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE\"; \ + echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ echo ldopts=\"$(ABI)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo libdir=\"$(LIBPATH)\"; \ diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index cec46a420..c8b3ecf63 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -45,9 +45,8 @@ ABI= WARNMORE=-fullwarn # Note: -KPIC is the default anyhow -#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5 -CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \ - -DPNG_NO_MMX_CODE +#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_NO_MMX_CODE # -g -DPNG_DEBUG=5 +CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_NO_MMX_CODE LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \ @@ -96,7 +95,7 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE\"; \ + echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ echo ccopts=\"$(ABI)\"; \ echo ldopts=\"$(ABI)\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index cee3a966c..644734d31 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -47,8 +47,8 @@ ZLIBINC=/usr/include #WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -CFLAGS=-I$(ZLIBINC) -O3 +#CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE +CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm INCPATH=$(prefix)/include @@ -73,7 +73,7 @@ DM=$(DESTDIR)$(MANPATH) OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o + pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o OBJSDLL = $(OBJS:.o=.pic.o) @@ -243,5 +243,6 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h +pnggccrd.o pnggccrd.pic.o: png.h pngconf.h pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index bf41f87ec..74dc257f7 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) -Wall -O \ - -DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE; \ + -DPNG_NO_MMX_CODE; \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm @@ -92,7 +92,7 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_MMX_CODE\"; \ + echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 215874378..b18c5f56b 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19beta16 +PNGMIN = 1.2.19beta17 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -44,7 +44,6 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion CFLAGS=-I$(ZLIBINC) -Wall -O \ - -DPNG_USE_PNGGCCRD \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm @@ -92,7 +91,7 @@ libpng-config: ( cat scripts/libpng-config-head.in; \ echo prefix=\"$(prefix)\"; \ echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ - echo cppflags=\"-DPNG_USE_PNGGCCRD"; \ + echo cppflags=\""; \ echo L_opts=\"-L$(LIBPATH)\"; \ echo R_opts=\"-R$(LIBPATH)\"; \ echo libs=\"-lpng12 -lz -lm\"; \ diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index d23d81296..fc6ece67d 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -11,7 +11,7 @@ CC = cl LD = link AR = lib -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 b296248eb..3c59af453 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19beta16 +; Version 1.2.19beta17 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index bba2eb81b..57b679e58 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19beta16 +;Version 1.2.19beta17 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |