diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-06-25 21:42:28 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-06-25 21:46:45 -0500 |
commit | a42edec9ef710a88f5069deb0ec050ea2b1f309e (patch) | |
tree | 2623a08418f2fe265a412ccc43fa9f6c79e91754 | |
parent | a272d8fe3dff9ee7d73000bf870a79ba39920d09 (diff) | |
download | libpng-1.5.0beta33.tar.gz |
[devel] Imported from libpng-1.5.0beta33.tarv1.5.0beta33
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | INSTALL | 4 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpng-1.5.0beta33.txt (renamed from libpng-1.5.0beta32.txt) | 8 | ||||
-rw-r--r-- | libpng.3 | 16 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
22 files changed, 51 insertions, 51 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c50211d69..e7bc024ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta32 +# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta33 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.5.0beta32 - June 26, 2010 +Installing libpng version 1.5.0beta33 - June 26, 2010 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.5.0beta32" or "libpng15" and "zlib-1.2.3" +might be called "libpng-1.5.0beta33" or "libpng15" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -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.0beta32, June 26, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta33, June 26, 2010, 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 @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta32 - June 26, 2010 (shared library 15.0) +README for libpng version 1.5.0beta33 - June 26, 2010 (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. @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta32. +# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta33. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.0beta32' -PACKAGE_STRING='libpng 1.5.0beta32' +PACKAGE_VERSION='1.5.0beta33' +PACKAGE_STRING='libpng 1.5.0beta33' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.0beta32 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.0beta33 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.0beta32:";; + short | recursive ) echo "Configuration of libpng 1.5.0beta33:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.0beta32 +libpng configure 1.5.0beta33 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,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.0beta32, which was +It was created by libpng $as_me 1.5.0beta33, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.0beta32' + VERSION='1.5.0beta33' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.5.0beta32 +PNGLIB_VERSION=1.5.0beta33 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 @@ -12119,7 +12119,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.0beta32, which was +This file was extended by libpng $as_me 1.5.0beta33, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12185,7 +12185,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.0beta32 +libpng config.status 1.5.0beta33 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c8135889e..a2bc108dd 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.0beta32], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.0beta33], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.0beta32 +PNGLIB_VERSION=1.5.0beta33 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=0 diff --git a/libpng-1.5.0beta32.txt b/libpng-1.5.0beta33.txt index f68aafff7..942c2d827 100644 --- a/libpng-1.5.0beta32.txt +++ b/libpng-1.5.0beta33.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0beta32 - June 26, 2010 + libpng version 1.5.0beta33 - June 26, 2010 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta32 - June 26, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta33 - June 26, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta32, not all possible expansions are supported. +As of libpng version 1.5.0beta33, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3307,7 +3307,7 @@ 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.0beta32 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta33 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 26, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta32 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta33 .SH SYNOPSIS \fI\fB @@ -789,7 +789,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.5.0beta32 - June 26, 2010 + libpng version 1.5.0beta33 - June 26, 2010 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -800,7 +800,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0beta32 - June 26, 2010 + libpng versions 0.97, January 1998, through 1.5.0beta33 - June 26, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1695,7 +1695,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.5.0beta32, not all possible expansions are supported. +As of libpng version 1.5.0beta33, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4096,7 +4096,7 @@ 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.0beta32 are Y2K compliant. It is my belief that earlier +upward through 1.5.0beta33 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 @@ -4275,7 +4275,7 @@ the first widely used release: 1.4.1 14 10401 14.so.14.1[.0] 1.4.2 14 10402 14.so.14.2[.0] 1.4.3 14 10403 14.so.14.3[.0] - 1.5.0beta01-32 15 10500 15.so.15.0[.0] + 1.5.0beta01-33 15 10500 15.so.15.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4332,7 +4332,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.0beta32 - June 26, 2010: +Libpng version 1.5.0beta33 - June 26, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4355,7 +4355,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.0beta32, June 26, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.5.0beta33, June 26, 2010, 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 diff --git a/libpngpf.3 b/libpngpf.3 index ab57c5199..9e67eba92 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "June 26, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta32 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta33 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta32 Your_png_h_is_not_version_1_5_0beta32; +typedef version_1_5_0beta33 Your_png_h_is_not_version_1_5_0beta33; /* Version information for C files. This had better match the version * string defined in png.h. @@ -560,13 +560,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.5.0beta32 - June 26, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.5.0beta33 - June 26, 2010" 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.5.0beta32 - June 26, 2010\ + return ((png_charp) "libpng version 1.5.0beta33 - June 26, 2010\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.0beta32 - June 26, 2010 + * libpng version 1.5.0beta33 - June 26, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.5.0beta32 - June 26, 2010 + * libpng version 1.5.0beta33 - June 26, 2010 * 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) @@ -1716,4 +1716,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_5_0beta32 your_png_h_is_not_version_1_5_0beta32; +typedef version_1_5_0beta33 your_png_h_is_not_version_1_5_0beta33; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index f2dafb280..3df05219d 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.0beta32 - June 26, 2010 +libpng version 1.5.0beta33 - June 26, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3329e656f..440dc0b03 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source and build * - * libpng version 1.5.0beta32 - June 26, 2010 + * libpng version 1.5.0beta33 - June 26, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index d16a1fc35..f2788f45e 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.0beta32 - June 26, 2010 +Makefiles for libpng version 1.5.0beta33 - June 26, 2010 pnglibconf.h => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.0beta32) + (gcc, creates libpng15.so.15.1.5.0beta33) 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 => 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.0beta32) + gcc, creates libpng15.so.15.1.5.0beta33) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -35,12 +35,12 @@ pnglibconf.h => 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.0beta32) + creates libpng15.so.15.1.5.0beta33) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.0beta32) + creates libpng15.so.15.1.5.0beta33) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.0beta32) + creates libpng15.so.15.1.5.0beta33) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 5597590ca..8856493e1 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.0beta32 +version=1.5.0beta33 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 192225bc7..d1cdf9367 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng15 Name: libpng Description: Loads and saves PNG files -Version: 1.5.0beta32 +Version: 1.5.0beta33 Libs: -L${libdir} -lpng15 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d75b662bf..24f8a5107 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15 LIB= png15 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.0beta32 +SHLIB_MINOR= 1.5.0beta33 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 d93980300..f7237fa7e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.5.0beta32 +SHLIB_MINOR= 1.5.0beta33 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.openbsd b/scripts/makefile.openbsd index 103fc0736..29536670b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.0beta32 +SHLIB_MINOR= 1.5.0beta33 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/symbols.def b/scripts/symbols.def index a470cce1f..1696f9651 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.5.0beta32 +;Version 1.5.0beta33 png_access_version_number @1 png_set_sig_bytes @2 png_sig_cmp @3 |