--amend [devel] Imported from libpng-1.5.1rc02.tar

This commit is contained in:
Glenn Randers-Pehrson 2011-01-31 10:23:16 -06:00
parent 25d2d47f86
commit 2506e53400
22 changed files with 58 additions and 58 deletions

View File

@ -264,7 +264,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE})
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 15.${PNGLIB_RELEASE}.1.5.1rc01
# VERSION 15.${PNGLIB_RELEASE}.1.5.1rc02
VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15
CLEAN_DIRECT_OUTPUT 1)

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.5.1rc01, January 29, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 31, 2011, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 29, 2011
January 31, 2011

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.5.1rc01 - January 29, 2011 (shared library 15.0)
README for libpng version 1.5.1rc02 - January 31, 2011 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.

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.68 for libpng 1.5.1rc01.
# Generated by GNU Autoconf 2.68 for libpng 1.5.1rc02.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.5.1rc01'
PACKAGE_STRING='libpng 1.5.1rc01'
PACKAGE_VERSION='1.5.1rc02'
PACKAGE_STRING='libpng 1.5.1rc02'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1307,7 +1307,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.5.1rc01 to adapt to many kinds of systems.
\`configure' configures libpng 1.5.1rc02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1377,7 +1377,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.1rc01:";;
short | recursive ) echo "Configuration of libpng 1.5.1rc02:";;
esac
cat <<\_ACEOF
@ -1485,7 +1485,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.5.1rc01
libpng configure 1.5.1rc02
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@ -1908,7 +1908,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.5.1rc01, which was
It was created by libpng $as_me 1.5.1rc02, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@ -2723,7 +2723,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.5.1rc01'
VERSION='1.5.1rc02'
cat >>confdefs.h <<_ACEOF
@ -2787,7 +2787,7 @@ fi
PNGLIB_VERSION=1.5.1rc01
PNGLIB_VERSION=1.5.1rc02
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=1
@ -13040,7 +13040,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.5.1rc01, which was
This file was extended by libpng $as_me 1.5.1rc02, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -13106,7 +13106,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.5.1rc01
libpng config.status 1.5.1rc02
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"

View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.5.1rc01], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.5.1rc02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.5.1rc01
PNGLIB_VERSION=1.5.1rc02
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=1

View File

@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.5.1rc02 - January 29, 2011
libpng version 1.5.1rc02 - January 31, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.5.1rc02 - January 29, 2011
libpng versions 0.97, January 1998, through 1.5.1rc02 - January 31, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@ -4081,7 +4081,7 @@ Other rules can be inferred by inspecting the libpng source.
XIV. Y2K Compliance in libpng
January 29, 2011
January 31, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.

View File

@ -1,4 +1,4 @@
.TH LIBPNG 3 "January 29, 2011"
.TH LIBPNG 3 "January 31, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1rc02
.SH SYNOPSIS
@ -919,7 +919,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.5.1rc02 - January 29, 2011
libpng version 1.5.1rc02 - January 31, 2011
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@ -930,7 +930,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.5.1rc02 - January 29, 2011
libpng versions 0.97, January 1998, through 1.5.1rc02 - January 31, 2011
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2011 Glenn Randers-Pehrson
@ -5000,7 +5000,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIV. Y2K Compliance in libpng
January 29, 2011
January 31, 2011
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@ -5247,7 +5247,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.5.1rc02 - January 29, 2011:
Libpng version 1.5.1rc02 - January 31, 2011:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -5270,7 +5270,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 29, 2011, are
libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 31, 2011, 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
@ -5369,7 +5369,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 29, 2011
January 31, 2011
.\" end of man page

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "January 29, 2011"
.TH LIBPNGPF 3 "January 31, 2011"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1rc01
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1rc02
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "January 29, 2011"
.TH PNG 5 "January 31, 2011"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

6
png.c
View File

@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_5_1rc01 Your_png_h_is_not_version_1_5_1rc01;
typedef png_libpng_version_1_5_1rc02 Your_png_h_is_not_version_1_5_1rc02;
/* 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
@ -555,13 +555,13 @@ png_get_copyright(png_const_structp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.5.1rc01 - January 29, 2011" PNG_STRING_NEWLINE \
"libpng version 1.5.1rc02 - January 31, 2011" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2011 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 "libpng version 1.5.1rc01 - January 29, 2011\
return "libpng version 1.5.1rc02 - January 31, 2011\
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

18
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.5.1rc01 - January 29, 2011
* libpng version 1.5.1rc02 - January 31, 2011
* Copyright (c) 1998-2011 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.5.1rc01 - January 29, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.5.1rc02 - January 31, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -177,7 +177,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.1rc01, January 29, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.1rc02, January 31, 2011, are
* Copyright (c) 2004, 2006-2011 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:
@ -289,13 +289,13 @@
* Y2K compliance in libpng:
* =========================
*
* January 29, 2011
* January 31, 2011
*
* 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.5.1rc01 are Y2K compliant. It is my belief that
* upward through 1.5.1rc02 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
@ -351,9 +351,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.1rc01"
#define PNG_LIBPNG_VER_STRING "1.5.1rc02"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.1rc01 - January 29, 2011\n"
" libpng version 1.5.1rc02 - January 31, 2011\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@ -366,7 +366,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 01
#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -508,7 +508,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef char* png_libpng_version_1_5_1rc01;
typedef char* png_libpng_version_1_5_1rc02;
/* Three color definitions. The order of the red, green, and blue, (and the
* exact size) is not important, although the size of the fields need to

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.5.1rc01 - (PENDING RELEASE)
* libpng version 1.5.1rc02 - (PENDING RELEASE)
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

View File

@ -1784,4 +1784,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_5_1rc01 Your_png_h_is_not_version_1_5_1rc01;
typedef png_libpng_version_1_5_1rc02 Your_png_h_is_not_version_1_5_1rc02;

View File

@ -1,7 +1,7 @@
VisualStudio instructions
libpng version 1.5.1rc01 - January 29, 2011
libpng version 1.5.1rc02 - January 31, 2011
Copyright (c) 1998-2010 Glenn Randers-Pehrson

View File

@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.5.1rc01 - January 29, 2011
* libpng version 1.5.1rc02 - January 31, 2011
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*

View File

@ -1,9 +1,9 @@
Makefiles for libpng version 1.5.1rc01 - January 29, 2011
Makefiles for libpng version 1.5.1rc02 - January 31, 2011
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng15.so.15.1.5.1rc01)
(gcc, creates libpng15.so.15.1.5.1rc02)
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 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
(gcc, creates libpng15.so.15.1.5.1rc01)
(gcc, creates libpng15.so.15.1.5.1rc02)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@ -35,12 +35,12 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng15.so.15.1.5.1rc01)
creates libpng15.so.15.1.5.1rc02)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng15.so.15.1.5.1rc01)
creates libpng15.so.15.1.5.1rc02)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng15.so.15.1.5.1rc01)
creates libpng15.so.15.1.5.1rc02)
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.5.1rc01
version=1.5.1rc02
prefix=""
libdir=""
libs=""

View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
Version: 1.5.1rc01
Version: 1.5.1rc02
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}

View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
LIB= png15
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.1rc01
SHLIB_MINOR= 1.5.1rc02
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= 15
SHLIB_MINOR= 1.5.1rc01
SHLIB_MINOR= 1.5.1rc02
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= 15
SHLIB_MINOR= 1.5.1rc01
SHLIB_MINOR= 1.5.1rc02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.5.1rc01
;Version 1.5.1rc02
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3