[master] Bump to version 1.4.6beta04

This commit is contained in:
Glenn Randers-Pehrson 2011-01-15 11:31:34 -06:00
parent d486eb18c5
commit 23c2ea38a6
27 changed files with 58 additions and 60 deletions

View File

@ -39,8 +39,7 @@ version 1.4.6beta03 [January 14, 2011]
Fixed some typecasts in png_debug statements (Cosmin).
version 1.4.6beta04 [January 15, 2011]
Updated documentation of png_set|get_tRNS() and png_set|get_iCCP()
(Thomas Klausner).
Updated documentation of png_set|get_tRNS() (Thomas Klausner).
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -2748,8 +2748,7 @@ version 1.4.6beta03 [January 14, 2011]
Fixed some typecasts in png_debug statements (Cosmin).
version 1.4.6beta04 [January 15, 2011]
Updated documentation of png_set|get_tRNS() and png_set|get_iCCP()
(Thomas Klausner).
Updated documentation of png_set|get_tRNS() (Thomas Klausner).
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta03
# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta04
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)

View File

@ -1,5 +1,5 @@
Installing libpng version 1.4.6beta03 - January 15, 2011
Installing libpng version 1.4.6beta04 - January 15, 2011
On Unix/Linux and similar systems, you can simply type
@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
might be called "libpng-1.4.6beta03" or "libpng14" and "zlib-1.2.3"
might be called "libpng-1.4.6beta04" or "libpng14" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:

View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta03, January 15, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.4.6beta04, January 15, 2011, are
Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors

12
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.4.6beta03 - January 15, 2011 (shared library 14.0)
README for libpng version 1.4.6beta04 - January 15, 2011 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@ -185,9 +185,9 @@ Files in this distribution:
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@ -209,12 +209,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
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

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta03.
# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta04.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -562,8 +562,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.4.6beta03'
PACKAGE_STRING='libpng 1.4.6beta03'
PACKAGE_VERSION='1.4.6beta04'
PACKAGE_STRING='libpng 1.4.6beta04'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1292,7 +1292,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libpng 1.4.6beta03 to adapt to many kinds of systems.
\`configure' configures libpng 1.4.6beta04 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1362,7 +1362,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.4.6beta03:";;
short | recursive ) echo "Configuration of libpng 1.4.6beta04:";;
esac
cat <<\_ACEOF
@ -1467,7 +1467,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.4.6beta03
libpng configure 1.4.6beta04
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@ -1892,7 +1892,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng $as_me 1.4.6beta03, which was
It was created by libpng $as_me 1.4.6beta04, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@ -2700,7 +2700,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.4.6beta03'
VERSION='1.4.6beta04'
cat >>confdefs.h <<_ACEOF
@ -2764,7 +2764,7 @@ fi
PNGLIB_VERSION=1.4.6beta03
PNGLIB_VERSION=1.4.6beta04
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6
@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.4.6beta03, which was
This file was extended by libpng $as_me 1.4.6beta04, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12241,7 +12241,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libpng config.status 1.4.6beta03
libpng config.status 1.4.6beta04
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

View File

@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time
dnl stamps are correct
AC_PREREQ(2.59)
AC_INIT([libpng], [1.4.6beta03], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.4.6beta04], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
dnl Version number stuff here:
PNGLIB_VERSION=1.4.6beta03
PNGLIB_VERSION=1.4.6beta04
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=6

View File

@ -160,7 +160,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta04
\fI\fB
\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_bytepp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP
\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_charpp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP
\fI\fB
@ -506,7 +506,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta04
\fI\fB
\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_bytep \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP
\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP
\fI\fB

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "January 15, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta03
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta04
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

6
png.c
View File

@ -17,7 +17,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_6beta03 Your_png_h_is_not_version_1_4_6beta03;
typedef version_1_4_6beta04 Your_png_h_is_not_version_1_4_6beta04;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.4.6beta03 - January 15, 2011" PNG_STRING_NEWLINE \
"libpng version 1.4.6beta04 - January 15, 2011" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
return ((png_charp) "libpng version 1.4.6beta03 - January 15, 2011\
return ((png_charp) "libpng version 1.4.6beta04 - January 15, 2011\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

16
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.6beta03 - January 15, 2011
* libpng version 1.4.6beta04 - January 15, 2011
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.4.6beta03 - January 15, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.4.6beta04 - January 15, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -186,7 +186,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.6beta03, January 15, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.6beta04, January 15, 2011, are
* Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@ -304,7 +304,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.4.6beta03 are Y2K compliant. It is my belief that earlier
* upward through 1.4.6beta04 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
@ -360,9 +360,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.6beta03"
#define PNG_LIBPNG_VER_STRING "1.4.6beta04"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.6beta03 - January 15, 2011\n"
" libpng version 1.4.6beta04 - January 15, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@ -375,7 +375,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 03
#define PNG_LIBPNG_VER_BUILD 04
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1484,7 +1484,7 @@ struct png_struct_def
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef png_structp version_1_4_6beta03;
typedef png_structp version_1_4_6beta04;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.4.6beta03 - January 15, 2011
* libpng version 1.4.6beta04 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.4.6beta03 - January 15, 2011
* libpng version 1.4.6beta04 - January 15, 2011
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1687,4 +1687,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_6beta03 your_png_h_is_not_version_1_4_6beta03;
typedef version_1_4_6beta04 your_png_h_is_not_version_1_4_6beta04;

View File

@ -1,7 +1,7 @@
VisualStudio instructions
libpng version 1.4.6beta03 - January 15, 2011
libpng version 1.4.6beta04 - January 15, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson

View File

@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
* libpng version 1.4.6beta03 - January 15, 2011
* libpng version 1.4.6beta04 - January 15, 2011
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*

View File

@ -1,8 +1,8 @@
Makefiles for libpng version 1.4.6beta03 - January 15, 2011
Makefiles for libpng version 1.4.6beta04 - January 15, 2011
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@ -20,7 +20,7 @@ Makefiles for libpng version 1.4.6beta03 - January 15, 2011
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
(gcc, creates libpng14.so.14.1.4.6beta03)
(gcc, creates libpng14.so.14.1.4.6beta04)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.6beta03 - January 15, 2011
makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng14.so.14.1.4.6beta03)
creates libpng14.so.14.1.4.6beta04)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng14.so.14.1.4.6beta03)
creates libpng14.so.14.1.4.6beta04)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng14.so.14.1.4.6beta03)
creates libpng14.so.14.1.4.6beta04)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile

View File

@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.4.6beta03
version=1.4.6beta04
prefix=""
libdir=""
libs=""

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng14
Name: libpng
Description: Loads and saves PNG files
Version: 1.4.6beta03
Version: 1.4.6beta04
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14
LIB= png14
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.6beta03
SHLIB_MINOR= 1.4.6beta04
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

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.4.6beta03
SHLIB_MINOR= 1.4.6beta04
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

View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.4.6beta03
SHLIB_MINOR= 1.4.6beta04
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

View File

@ -15,7 +15,7 @@ LIBRARY lpngce
png_get_int_32
EXPORTS
;Version 1.4.6beta03
;Version 1.4.6beta04
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.4.6beta03
; Version 1.4.6beta04
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.4.6beta03
;Version 1.4.6beta04
png_build_grayscale_palette
png_chunk_error
png_chunk_warning