diff options
51 files changed, 123 insertions, 146 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.28rc5 - September 2, 2007 +Libpng 1.0.28rc6 - September 3, 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.0.28rc5.tar.gz - libpng-1.0.28rc5.tar.bz2 + libpng-1.0.28rc6.tar.gz + libpng-1.0.28rc6.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.28rc5-no-config.tar.gz - libpng-1.0.28rc5-no-config.tar.bz2 + libpng-1.0.28rc6-no-config.tar.gz + libpng-1.0.28rc6-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1028r05.zip - lp1028r05.tar.bz2 + lp1028r06.zip + lp1028r06.tar.bz2 Project files - libpng-1.0.28rc5-project-netware.zip - libpng-1.0.28rc5-project-wince.zip + libpng-1.0.28rc6-project-netware.zip + libpng-1.0.28rc6-project-wince.zip Other information: - libpng-1.0.28rc5-README.txt - libpng-1.0.28rc5-KNOWNBUGS.txt - libpng-1.0.28rc5-LICENSE.txt - libpng-1.0.28rc5-Y2K-compliance.txt + libpng-1.0.28rc6-README.txt + libpng-1.0.28rc6-KNOWNBUGS.txt + libpng-1.0.28rc6-LICENSE.txt + libpng-1.0.28rc6-Y2K-compliance.txt Changes since the last public release (1.0.27): @@ -62,7 +62,7 @@ version 1.2.20rc2 [August 27, 2007] Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c, or part of pngrutil.c is selected. -version 1.2.20rc3 [September 2, 2007] +version 1.2.20rc3 [September 3, 2007] Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected. Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects. Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined. @@ -76,6 +76,10 @@ version 1.2.20rc5 [September 2, 2007] Restored configure and Makefile.in to rc3 and put a snippet of code in pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection +version 1.2.20rc6 [September 3, 2007] + Fixed bugs in scripts/CMakeLists.txt + Removed pngvcrd.c references from msvc projects. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1922,6 +1922,10 @@ version 1.2.20rc5 [September 2, 2007] Restored configure and Makefile.in to rc3 and put a snippet of code in pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection +version 1.2.20rc6 [September 3, 2007] + Fixed bugs in scripts/CMakeLists.txt + Removed pngvcrd.c references from msvc projects. + 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.28rc5 - September 2, 2007 +Installing libpng version 1.0.28rc6 - September 3, 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.0.28rc5" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.0.28rc6" 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.28rc5) + gcc, creates libpng10.so.0.1.0.28rc6) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.28rc5) + (gcc, creates libpng10.so.0.1.0.28rc6) 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.28rc5) + creates libpng10.so.0.1.0.28rc6) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.28rc5) + creates libpng10.so.0.1.0.28rc6) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng10.so.0.1.0.28rc5) + creates libpng10.so.0.1.0.28rc6) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.28rc5) + creates libpng10.so.0.1.0.28rc6) 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.28rc5 +Known bugs in libpng version 1.0.28rc6 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.28rc5, September 2, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.28rc6, September 3, 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 -September 2, 2007 +September 3, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.0.28rc5 - September 2, 2007 (shared library 10.0) +README for libpng version 1.0.28rc6 - September 3, 2007 (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. @@ -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 libpng10.so.0.1.0.28rc5) + gcc, creates libpng10.so.0.1.0.28rc6) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.28rc5) + (gcc, creates libpng10.so.0.1.0.28rc6) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.28rc5, + (gcc, creates libpng10.so.0.1.0.28rc6, 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 libpng10.so.0.1.0.28rc5) + (gcc, creates libpng10.so.0.1.0.28rc6) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.28rc5) + (gcc, creates libpng10.so.0.1.0.28rc6) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.28rc5) + (gcc, creates libpng10.so.0.1.0.28rc6) 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: ========================= - September 2, 2007 + September 3, 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.0.28rc5 are Y2K compliant. It is my belief that earlier + upward through 1.0.28rc6 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.0.28rc5. +# Generated by GNU Autoconf 2.61 for libpng 1.0.28rc6. # # 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.0.28rc5' -PACKAGE_STRING='libpng 1.0.28rc5' +PACKAGE_VERSION='1.0.28rc6' +PACKAGE_STRING='libpng 1.0.28rc6' 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.0.28rc5 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.28rc6 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.0.28rc5:";; + short | recursive ) echo "Configuration of libpng 1.0.28rc6:";; 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.0.28rc5 +libpng configure 1.0.28rc6 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.0.28rc5, which was +It was created by libpng $as_me 1.0.28rc6, 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.0.28rc5' + VERSION='1.0.28rc6' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.0.28rc5 +PNGLIB_VERSION=1.0.28rc6 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=28 @@ -21282,7 +21282,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.28rc5, which was +This file was extended by libpng $as_me 1.0.28rc6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.0.28rc5 +libpng config.status 1.0.28rc6 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 70af1c8b4..449408a9d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.28rc5], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.28rc6], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.28rc5 +PNGLIB_VERSION=1.0.28rc6 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=28 diff --git a/libpng-1.0.28rc5.txt b/libpng-1.0.28rc6.txt index df6b947d5..c980f37b5 100644 --- a/libpng-1.0.28rc5.txt +++ b/libpng-1.0.28rc6.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.28rc5 - September 2, 2007 + libpng version 1.0.28rc6 - September 3, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2760,13 +2760,13 @@ application: VIII. Y2K Compliance in libpng -September 2, 2007 +September 3, 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.0.28rc5 are Y2K compliant. It is my belief that earlier +upward through 1.0.28rc6 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 "September 2, 2007" +.TH LIBPNG 3 "September 3, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.28rc5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.28rc6 .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.0.28rc5 - September 2, 2007 + libpng version 1.0.28rc6 - September 3, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3170,13 +3170,13 @@ application: .SH VIII. Y2K Compliance in libpng -September 2, 2007 +September 3, 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.0.28rc5 are Y2K compliant. It is my belief that earlier +upward through 1.0.28rc6 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 @@ -3371,8 +3371,8 @@ the first widely used release: 1.0.27 10 10027 10.so.0.27[.0] 1.2.19 13 10219 12.so.0.19[.0] 1.2.20beta01-04 13 10220 12.so.0.20[.0] - 1.0.28rc1-5 10 10028 10.so.0.28[.0] - 1.2.20rc1-5 13 10220 12.so.0.20[.0] + 1.0.28rc1-6 10 10028 10.so.0.28[.0] + 1.2.20rc1-6 13 10220 12.so.0.20[.0] 1.0.28 10 10028 10.so.0.28[.0] 1.2.20 13 10220 12.so.0.20[.0] @@ -3430,7 +3430,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.28rc5 - September 2, 2007: +Libpng version 1.0.28rc6 - September 3, 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). @@ -3451,7 +3451,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.28rc5, September 2, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.28rc6, September 3, 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 @@ -3550,7 +3550,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 2, 2007 +September 3, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 473fa7002..b4c53ac9d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 2, 2007" +.TH LIBPNGPF 3 "September 3, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.28rc5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.28rc6 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "September 2, 2007" +.TH PNG 5 "September 3, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_28rc5 Your_png_h_is_not_version_1_0_28rc5; +typedef version_1_0_28rc6 Your_png_h_is_not_version_1_0_28rc6; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,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.28rc5 - September 2, 2007\n\ + return ((png_charp) "\n libpng version 1.0.28rc6 - September 3, 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.0.28rc5 - September 2, 2007 + * libpng version 1.0.28rc6 - September 3, 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.0.28rc5 - September 2, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.0.28rc6 - September 3, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -156,8 +156,8 @@ * 1.0.27 10 10027 10.so.0.27[.0] * 1.2.19 13 10219 12.so.0.19[.0] * 1.2.20beta01-04 13 10220 12.so.0.20[.0] - * 1.0.28rc1-5 10 10028 10.so.0.28[.0] - * 1.2.20rc1-5 13 10220 12.so.0.20[.0] + * 1.0.28rc1-6 10 10028 10.so.0.28[.0] + * 1.2.20rc1-6 13 10220 12.so.0.20[.0] * 1.0.28 10 10028 10.so.0.28[.0] * 1.2.20 13 10220 12.so.0.20[.0] * @@ -189,7 +189,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.28rc5, September 2, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.28rc6, September 3, 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: @@ -301,13 +301,13 @@ * Y2K compliance in libpng: * ========================= * - * September 2, 2007 + * September 3, 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.0.28rc5 are Y2K compliant. It is my belief that earlier + * upward through 1.0.28rc6 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 @@ -363,9 +363,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.28rc5" +#define PNG_LIBPNG_VER_STRING "1.0.28rc6" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.28rc5 - September 2, 2007\n" + " libpng version 1.0.28rc6 - September 3, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -377,7 +377,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 5 +#define PNG_LIBPNG_VER_BUILD 6 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1412,7 +1412,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_28rc5; +typedef png_structp version_1_0_28rc6; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.28rc5 - September 2, 2007 + * libpng version 1.0.28rc6 - September 3, 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 6bd20fd0a..a6b23429f 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.20 September 2, 2007 + * Last changed in libpng 1.2.20 September 3, 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/pngpread.c b/pngpread.c index 6810056a1..3c35ac49a 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.20 September 2, 2007 + * Last changed in libpng 1.2.20 September 3, 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) @@ -1548,4 +1548,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_28rc5 your_png_h_is_not_version_1_0_28rc5; +typedef version_1_0_28rc6 your_png_h_is_not_version_1_0_28rc6; diff --git a/projects/visualc6/libpng.dsp b/projects/visualc6/libpng.dsp index 94f53c9d9..d25ad16e4 100644 --- a/projects/visualc6/libpng.dsp +++ b/projects/visualc6/libpng.dsp @@ -365,8 +365,6 @@ SOURCE=..\..\pngtrans.c # End Source File
# Begin Source File
-SOURCE=..\..\pngvcrd.c
-
!IF "$(CFG)" == "libpng - Win32 DLL Release"
# PROP Exclude_From_Build 1
diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index b4a338242..3a3d4cce9 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -43,7 +43,7 @@ Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG";_CRT_SECURE_NO_WARNINGS
+ PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
Culture="1033"
AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>
<Tool
@@ -564,39 +564,6 @@ RelativePath="..\..\pngtrans.c">
</File>
<File
- RelativePath="..\..\pngvcrd.c">
- <FileConfiguration
- Name="DLL Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="DLL VB|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="LIB Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="LIB Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scripts\pngw32.def">
<FileConfiguration
Name="DLL VB|Win32"
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 0e5195483..5d3582b8a 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -97,6 +97,10 @@ set(pngtest_sources pngtest.c ) # SOME NEEDED DEFINITIONS +if(MSVC) + add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE) +endif(MSVC) + add_definitions(-DZLIB_DLL) add_definitions(-DLIBPNG_NO_MMX) @@ -165,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.28rc5 +# VERSION 0.${PNGLIB_RELEASE}.1.0.28rc6 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 19094175f..41e97de33 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.28rc5 +version=1.0.28rc6 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 837fc4bb1..567cd1e46 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.28rc5 +Version: 1.0.28rc6 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 4422f2548..a47b40746 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.28rc5 +Version: 1.0.28rc6 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 0bc37f30f..82391cdf0 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 5d05aaae1..1a630dae4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index b914855d5..bc418d3ea 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.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 6dd147c8c..fceff437a 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 03e54b138..d5976ba9e 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.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 8b688e021..dfbda7694 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 6469ad977..197d488b7 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 2aef92018..8ab03eb47 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 555d86624..a6fbac6f8 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 82eb6945e..e7e4563f2 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.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0815acd00..a70ce6e58 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 5691b73ba..94455a620 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.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index fa0952ee8..a3abbd8b5 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index c87b8aad2..08988700a 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.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 5ae5f1863..7a0ed9a8d 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.28rc5 +SHLIB_MINOR= 1.0.28rc6 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 924137ce7..0935c3031 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.28rc5 +SHLIB_MINOR= 1.0.28rc6 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 9833d6f73..5052b8e96 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 148818d27..836fb089b 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.28rc5 +SHLIB_MINOR= 1.0.28rc6 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 2fddcaae1..c0cf96aea 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 0cc132017..7f7c8ca1c 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index dcb28362c..634ba16bd 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 484a9b4e2..124c66130 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 1a93bfd30..c34af6a70 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index aafbc5433..423b59315 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.28rc5 +PNGMIN = 1.0.28rc6 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index d2c695b47..cf0df2e96 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.28rc5 +; Version 1.0.28rc6 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index bc292c1de..0a925a65e 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.28rc5 +;Version 1.0.28rc6 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |