Skip to content

Commit

Permalink
[libpng16] Bump version to 1.6.32beta01
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn Randers-Pehrson committed Jul 27, 2017
1 parent 9fcb846 commit b73c891
Show file tree
Hide file tree
Showing 30 changed files with 72 additions and 96 deletions.
54 changes: 14 additions & 40 deletions ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,57 +1,31 @@
Libpng 1.6.31 - July 27, 2017
Libpng 1.6.32beta01 - July 27, 2017

This is a public release of libpng, intended for use in production codes.
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.

Files available for download:

Source files with LF line endings (for Unix/Linux) and with a
"configure" script

libpng-1.6.31.tar.xz (LZMA-compressed, recommended)
libpng-1.6.31.tar.gz
1.6.32beta01.tar.xz (LZMA-compressed, recommended)
1.6.32beta01.tar.gz

Source files with CRLF line endings (for Windows), without the
"configure" script

lpng1631.7z (LZMA-compressed, recommended)
lpng1631.zip
lp1632b01.7z (LZMA-compressed, recommended)
lp1632b01.zip

Other information:

libpng-1.6.31-README.txt
libpng-1.6.31-LICENSE.txt
libpng-1.6.31-*.asc (armored detached GPG signatures)

Changes since the last public release (1.6.30):

Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it;
bug report by Michael Felt).
Revised pngpriv.h to work around failure to compile arm/filter_neon.S
("typedef" directive is unrecognized by the assembler). The problem
was introduced in libpng-1.6.30beta01.
Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx).
Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish).
Added instructions for disabling hardware optimizations in INSTALL.
Added "--enable-hardware-optimizations" configuration flag to enable
or disable all hardware optimizations with one flag.
Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms.
Changed "int" to "png_size_t" in intel/filter_sse2.c to prevent
possible integer overflow (Bug report by John Bowler).
Quieted "declaration after statement" warnings in intel/filter_sse2.c.
Added scripts/makefile-linux-opt, which has hardware optimizations enabled.
Removed one of the GCC-7.1.0 'strict-overflow' warnings that result when
integers appear on both sides of a compare. Worked around the others by
forcing the strict-overflow setting in the relevant functions to a level
where they are not reported (John Bowler).
Changed "FALL THROUGH" comments to "FALLTHROUGH" because GCC doesn't like
the space.
Worked around some C-style casts from (void*) because g++ 5.4.0 objects
to them.
Increased the buffer size for 'sprint' to pass the gcc 7.1.0 'sprint
overflow' check that is on by default with -Wall -Wextra.
Added eXIf chunk support.
Added a minimal eXIf chunk (with Orientation and FocalLengthIn35mmFilm
tags) to pngtest.png.
1.6.32beta01-README.txt
1.6.32beta01-LICENSE.txt
libpng-1.6.32beta01-*.asc (armored detached GPG signatures)

Changes since the last public release (1.6.31):

Version 1.6.32beta01 [July 27, 2017]

Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
Expand Down
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -5908,6 +5908,8 @@ Version 1.6.31rc02 [July 25, 2017]
Version 1.6.31 [July 27, 2017]
No changes.

Version 1.6.32beta01 [July 27, 2017]

Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ enable_testing()

set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
set(PNGLIB_RELEASE 31)
set(PNGLIB_RELEASE 32)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})

Expand Down Expand Up @@ -817,7 +817,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.31
# VERSION 16.${PNGLIB_RELEASE}.1.6.32beta01
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.31, July 27, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta01, July 27, 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.31 - July 27, 2017 (shared library 16.0)
README for libpng version 1.6.32beta01 - July 27, 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
2 changes: 1 addition & 1 deletion arm/filter_neon.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (c) 2014,2017 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
* Last changed in libpng 1.6.31 [July 27, 2017]
* Last changed in libpng 1.6.31 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
Expand Down
6 changes: 3 additions & 3 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.31],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.32beta01],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])

# libpng does not follow GNU file name conventions (hence 'foreign')
Expand All @@ -46,10 +46,10 @@ 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.31
PNGLIB_VERSION=1.6.32beta01
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=31
PNGLIB_RELEASE=32

dnl End of version number stuff

Expand Down
2 changes: 1 addition & 1 deletion intel/filter_sse2_intrinsics.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Written by Mike Klein and Matt Sarett
* Derived from arm/filter_neon_intrinsics.c
*
* Last changed in libpng 1.6.31 [July 27, 2017]
* Last changed in libpng 1.6.31 [(PENDING RELEASE)]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
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.31 - July 27, 2017
libpng version 1.6.32beta01 - July 27, 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.31 - July 27, 2017
libpng versions 0.97, January 1998, through 1.6.32beta01 - July 27, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down Expand Up @@ -5404,7 +5404,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.31 are Y2K compliant. It is my belief that earlier
upward through 1.6.32beta01 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 "July 27, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.31
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta01
.SH SYNOPSIS
\fB
#include <png.h>\fP
Expand Down Expand Up @@ -514,7 +514,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.31 - July 27, 2017
libpng version 1.6.32beta01 - July 27, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2017 Glenn Randers-Pehrson
Expand All @@ -525,7 +525,7 @@ libpng-manual.txt - A description on how to use and modify libpng

Based on:

libpng versions 0.97, January 1998, through 1.6.31 - July 27, 2017
libpng versions 0.97, January 1998, through 1.6.32beta01 - July 27, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down Expand Up @@ -5918,7 +5918,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.31 are Y2K compliant. It is my belief that earlier
upward through 1.6.32beta01 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 @@ -6076,7 +6076,7 @@ possible without all of you.

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

Libpng version 1.6.31 - July 27, 2017:
Libpng version 1.6.32beta01 - July 27, 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 @@ -6101,7 +6101,7 @@ this sentence.

This code is released under the libpng license.

libpng versions 1.0.7, July 1, 2000 through 1.6.31, July 27, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta01, July 27, 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.31
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta01
(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_31 Your_png_h_is_not_version_1_6_31;
typedef png_libpng_version_1_6_32beta01 Your_png_h_is_not_version_1_6_32beta01;

#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
Expand Down Expand Up @@ -806,14 +806,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.31 - July 27, 2017" PNG_STRING_NEWLINE \
"libpng version 1.6.32beta01 - July 27, 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.31 - July 27, 2017\
return "libpng version 1.6.32beta01 - July 27, 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
22 changes: 11 additions & 11 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.31, July 27, 2017
* libpng version 1.6.32beta01, July 27, 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.31, July 27, 2017:
* libpng versions 0.97, January 1998, through 1.6.32beta01, July 27, 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.31, July 27, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.32beta01, July 27, 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.31 are Y2K compliant. It is my belief that
* upward through 1.6.32beta01 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,22 +309,22 @@
*/

/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.31"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31 - July 27, 2017\n"
#define PNG_LIBPNG_VER_STRING "1.6.32beta01"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta01 - July 27, 2017\n"

#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16

/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
#define PNG_LIBPNG_VER_RELEASE 31
#define PNG_LIBPNG_VER_RELEASE 32

/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/

#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_VER_BUILD 01

/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
Expand All @@ -341,15 +341,15 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */

#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA

/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
#define PNG_LIBPNG_VER 10631 /* 1.6.31 */
#define PNG_LIBPNG_VER 10632 /* 1.6.32 */

/* Library configuration: these options cannot be changed after
* the library has been built.
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_31;
typedef char* png_libpng_version_1_6_32beta01;

/* 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.31, July 27, 2017
* libpng version 1.6.32beta01, July 27, 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 @@ -2104,4 +2104,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_31 Your_png_h_is_not_version_1_6_31;
typedef png_libpng_version_1_6_32beta01 Your_png_h_is_not_version_1_6_32beta01;
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.31 - July 27, 2017
libpng version 1.6.32beta01 - July 27, 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.31 - July 27, 2017
* libpng version 1.6.32beta01 - July 27, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
Expand Down
Loading

0 comments on commit b73c891

Please sign in to comment.