Skip to content

Commit

Permalink
[libpng16] Bump version to 1.6.32beta12
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn Randers-Pehrson committed Aug 7, 2017
1 parent 646fad9 commit 7b8b711
Show file tree
Hide file tree
Showing 22 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(png PROPERTIES
# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta11
# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta12
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ this sentence.

This code is released under the libpng license.

libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README for libpng version 1.6.32beta11 - August 7, 2017 (shared library 16.0)
README for libpng version 1.6.32beta12 - August 7, 2017 (shared library 16.0)
See the note about version numbers near the top of png.h

See INSTALL for instructions on how to install libpng.
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ AC_PREREQ([2.68])

dnl Version number stuff here:

AC_INIT([libpng],[1.6.32beta11],[[email protected]])
AC_INIT([libpng],[1.6.32beta12],[[email protected]])
AC_CONFIG_MACRO_DIR([scripts])

# libpng does not follow GNU file name conventions (hence 'foreign')
Expand All @@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake

PNGLIB_VERSION=1.6.32beta11
PNGLIB_VERSION=1.6.32beta12
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=32
Expand Down
6 changes: 3 additions & 3 deletions libpng-manual.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng

libpng version 1.6.32beta11 - August 7, 2017
libpng version 1.6.32beta12 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
Expand All @@ -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.6.32beta11 - August 7, 2017
libpng versions 0.97, January 1998, through 1.6.32beta12 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down Expand Up @@ -5405,7 +5405,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.6.32beta11 are Y2K compliant. It is my belief that earlier
upward through 1.6.32beta12 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.

Libpng only has two year fields. One is a 2-byte unsigned integer
Expand Down
12 changes: 6 additions & 6 deletions libpng.3
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "August 7, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta12
.SH SYNOPSIS
\fB
#include <png.h>\fP
Expand Down Expand Up @@ -518,7 +518,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.6.32beta11 - August 7, 2017
libpng version 1.6.32beta12 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
Expand All @@ -529,7 +529,7 @@ libpng-manual.txt - A description on how to use and modify libpng

Based on:

libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017
libpng versions 0.97, January 1998, through 1.6.32beta12 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down Expand Up @@ -5923,7 +5923,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.6.32beta11 are Y2K compliant. It is my belief that earlier
upward through 1.6.32beta12 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.

Libpng only has two year fields. One is a 2-byte unsigned integer
Expand Down Expand Up @@ -6081,7 +6081,7 @@ possible without all of you.

Thanks to Frank J. T. Wojcik for helping with the documentation.

Libpng version 1.6.32beta11 - August 7, 2017:
Libpng version 1.6.32beta12 - August 7, 2017:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

Expand All @@ -6106,7 +6106,7 @@ this sentence.

This code is released under the libpng license.

libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
Expand Down
2 changes: 1 addition & 1 deletion libpngpf.3
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "April 1, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta12
(private functions)
.SH SYNOPSIS
\fB\fB#include \fI\fI"pngpriv.h"
Expand Down
6 changes: 3 additions & 3 deletions png.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_6_32beta11 Your_png_h_is_not_version_1_6_32beta11;
typedef png_libpng_version_1_6_32beta12 Your_png_h_is_not_version_1_6_32beta12;

#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
Expand Down Expand Up @@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.32beta11 - August 7, 2017" PNG_STRING_NEWLINE \
"libpng version 1.6.32beta12 - August 7, 2017" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2017 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.6.32beta11 - August 7, 2017\
return "libpng version 1.6.32beta12 - August 7, 2017\
Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
Expand Down
16 changes: 8 additions & 8 deletions png.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/* png.h - header file for PNG reference library
*
* libpng version 1.6.32beta11, August 7, 2017
* libpng version 1.6.32beta12, August 7, 2017
*
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
Expand All @@ -12,7 +12,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.32beta11, August 7, 2017:
* libpng versions 0.97, January 1998, through 1.6.32beta12, August 7, 2017:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
Expand All @@ -25,7 +25,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, August 7, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.32beta12, August 7, 2017 are
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
Expand Down Expand Up @@ -247,7 +247,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.6.32beta11 are Y2K compliant. It is my belief that
* upward through 1.6.32beta12 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
Expand Down Expand Up @@ -309,8 +309,8 @@
*/

/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.32beta11"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta11 - August 7, 2017\n"
#define PNG_LIBPNG_VER_STRING "1.6.32beta12"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta12 - August 7, 2017\n"

#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
Expand All @@ -324,7 +324,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/

#define PNG_LIBPNG_VER_BUILD 11
#define PNG_LIBPNG_VER_BUILD 12

/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
Expand Down Expand Up @@ -459,7 +459,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_6_32beta11;
typedef char* png_libpng_version_1_6_32beta12;

/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
Expand Down
2 changes: 1 addition & 1 deletion pngconf.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.32beta11, August 7, 2017
* libpng version 1.6.32beta12, August 7, 2017
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
Expand Down
2 changes: 1 addition & 1 deletion pngtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -2153,4 +2153,4 @@ main(void)
#endif

/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_32beta11 Your_png_h_is_not_version_1_6_32beta11;
typedef png_libpng_version_1_6_32beta12 Your_png_h_is_not_version_1_6_32beta12;
2 changes: 1 addition & 1 deletion projects/vstudio/README.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

VisualStudio instructions

libpng version 1.6.32beta11 - August 7, 2017
libpng version 1.6.32beta12 - August 7, 2017

Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson

Expand Down
2 changes: 1 addition & 1 deletion projects/vstudio/zlib.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.6.32beta11 - August 7, 2017
* libpng version 1.6.32beta12 - August 7, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
Expand Down
12 changes: 6 additions & 6 deletions scripts/README.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Makefiles for libpng version 1.6.32beta11 - August 7, 2017
Makefiles for libpng version 1.6.32beta12 - August 7, 2017

pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng16.so.16.1.6.32beta11)
(gcc, creates libpng16.so.16.1.6.32beta12)
makefile.linux-opt=> Linux/ELF makefile with hardware optimizations on
(gcc, creates libpng16.so.16.1.6.32beta11)
(gcc, creates libpng16.so.16.1.6.32beta12)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
Expand Down Expand Up @@ -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 libpng16.so.16.1.6.32beta11)
creates libpng16.so.16.1.6.32beta12)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng16.so.16.1.6.32beta11)
creates libpng16.so.16.1.6.32beta12)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng16.so.16.1.6.32beta11)
creates libpng16.so.16.1.6.32beta12)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
Expand Down
2 changes: 1 addition & 1 deletion scripts/def.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN ""
PNG_DFN "EXPORTS"
PNG_DFN ";Version 1.6.32beta11"
PNG_DFN ";Version 1.6.32beta12"

#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
Expand Down
2 changes: 1 addition & 1 deletion scripts/libpng-config-head.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Modeled after libxml-config.

version=1.6.32beta11
version=1.6.32beta12
prefix=""
libdir=""
libs=""
Expand Down
2 changes: 1 addition & 1 deletion scripts/libpng.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16

Name: libpng
Description: Loads and saves PNG files
Version: 1.6.32beta11
Version: 1.6.32beta12
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion scripts/makefile.ne12bsd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16

LIB= png16
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.6.32beta11
SHLIB_MINOR= 1.6.32beta12
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/makefile.netbsd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include

LIB= png
SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.32beta11
SHLIB_MINOR= 1.6.32beta12
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/makefile.openbsd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat

SHLIB_MAJOR= 16
SHLIB_MINOR= 1.6.32beta11
SHLIB_MINOR= 1.6.32beta12

LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
Expand Down
4 changes: 2 additions & 2 deletions scripts/pnglibconf.h.prebuilt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* libpng 1.6.32beta11 STANDARD API DEFINITION */
/* libpng 1.6.32beta12 STANDARD API DEFINITION */

/* pnglibconf.h - library build configuration */

/* Libpng version 1.6.32beta11 - August 7, 2017 */
/* Libpng version 1.6.32beta12 - August 7, 2017 */

/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */

Expand Down
2 changes: 1 addition & 1 deletion scripts/symbols.def
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;Version 1.6.32beta11
;Version 1.6.32beta12
;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng
Expand Down

0 comments on commit 7b8b711

Please sign in to comment.