From f9b874e27e4cf6d602c8fc4dea66076059a0c875 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 28 Aug 2017 12:03:27 -0500 Subject: [libpng15] Bump version to 1.5.30beta01 --- ANNOUNCE | 41 ++++++++++++++++++----------------------- CHANGES | 7 ++++++- CMakeLists.txt | 4 ++-- LICENSE | 4 ++-- README | 2 +- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- contrib/pngminus/png2pnm.c | 14 ++++++++++++-- contrib/pngminus/pnm2png.c | 14 ++++++++++++-- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 24 ++++++++++++------------ pngconf.h | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.cegcc | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.msys | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 32 files changed, 119 insertions(+), 99 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 38413381f..33c9f8730 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,41 +1,36 @@ -Libpng 1.5.29 - August 24, 2017 +Libpng 1.5.30beta01 - August 28, 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.5.29.tar.xz (LZMA-compressed, recommended) - libpng-1.5.29.tar.gz + 1.5.30beta01.tar.xz (LZMA-compressed, recommended) + 1.5.30beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng1529.7z (LZMA-compressed, recommended) - lpng1529.zip + lp1530b01.7z (LZMA-compressed, recommended) + lp1530b01.zip Other information: - libpng-1.5.29-README.txt - libpng-1.5.29-LICENSE.txt - libpng-1.5.29-*.asc (armored detached GPG signatures) - -Changes since the last public release (1.5.28): - Suppress clang warnings about implicit sign changes in png.c - Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer). - Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in - makefile.linux and makefile.solaris-x86 (Cosmin). - Silence clang -Wcomma warnings (Viktor Szakats). - Update Sourceforge URLs in documentation (https instead of http). - Moved chunk-name and chunk-length checks into PNG_EXTERN private - png_check_chunk_name() and png_check_chunk_length() functions - (Suggested by Max Stepin). - Merged pngtest.c with libpng-1.6.32. - Check for 0 return from png_get_rowbytes() in contrib/pngminus/*.c to stop - some Coverity issues (162705, 162706, and 162707). + 1.5.30beta01-README.txt + 1.5.30beta01-LICENSE.txt + libpng-1.5.30beta01-*.asc (armored detached GPG signatures) + +Changes since the last public release (1.5.29): + +Version 1.5.30beta01 [August 28, 2017] + Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing + parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse). + Fixed off-by-one error in png_do_check_palette_indexes() (Bug report + by Mick P., Source Forge Issue #269). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index ec60f3c73..4f017ca41 100644 --- a/CHANGES +++ b/CHANGES @@ -4550,9 +4550,14 @@ version 1.5.29beta02 [August 9, 2017] version 1.5.29rc01 [August 19, 2017] No changes. -version 1.5.29 [August 24, 2017] +version 1.5.29 [August 28, 2017] No changes. +Version 1.5.30beta01 [August 28, 2017] + Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing + parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse). + Fixed off-by-one error in png_do_check_palette_indexes() (Bug report + by Mick P., Source Forge Issue #269). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index bbd4304cd..1d5502c04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 29) +set(PNGLIB_RELEASE 30) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -535,7 +535,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.29 +# VERSION 15.${PNGLIB_RELEASE}.1.5.30beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index ba4d33d76..931a6cfa3 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.5.29, August 24, 2017 are +libpng versions 1.0.7, July 1, 2000 through 1.5.30beta01, August 28, 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 @@ -126,4 +126,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 24, 2017 +August 28, 2017 diff --git a/README b/README index f6f22c372..9e642dd86 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.29 - August 24, 2017 (shared library 15.0) +README for libpng version 1.5.30beta01 - August 28, 2017 (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. diff --git a/configure b/configure index a2e3b44dc..f3a1d48bb 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.29. +# Generated by GNU Autoconf 2.69 for libpng 1.5.30beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.29' -PACKAGE_STRING='libpng 1.5.29' +PACKAGE_VERSION='1.5.30beta01' +PACKAGE_STRING='libpng 1.5.30beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,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.29 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.30beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.29:";; + short | recursive ) echo "Configuration of libpng 1.5.30beta01:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.29 +libpng configure 1.5.30beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,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.29, which was +It was created by libpng $as_me 1.5.30beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.29' + VERSION='1.5.30beta01' cat >>confdefs.h <<_ACEOF @@ -2982,10 +2982,10 @@ fi -PNGLIB_VERSION=1.5.29 +PNGLIB_VERSION=1.5.30beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=29 +PNGLIB_RELEASE=30 @@ -14124,7 +14124,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.29, which was +This file was extended by libpng $as_me 1.5.30beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,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.29 +libpng config.status 1.5.30beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1e79a389b..81e846ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.29], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.30beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.29 +PNGLIB_VERSION=1.5.30beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=29 +PNGLIB_RELEASE=30 dnl End of version number stuff diff --git a/contrib/pngminus/png2pnm.c b/contrib/pngminus/png2pnm.c index 39a9f4673..1420a783b 100644 --- a/contrib/pngminus/png2pnm.c +++ b/contrib/pngminus/png2pnm.c @@ -5,7 +5,8 @@ * version 1.0 - 1999.10.15 - First version. * 1.1 - 2017.04.22 - Add buffer-size check (Glenn Randers-Pehrson) * 1.2 - 2017.08.24 - Fix potential overflow in buffer-size check - (Glenn Randers-Pehrson) + * (Glenn Randers-Pehrson) + * 1.3 - 2017.08.28 - Add PNGMINUS_UNUSED (Christian Hesse) * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, @@ -44,6 +45,7 @@ #define PNG_DEBUG 0 #endif + #include "png.h" /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */ @@ -51,6 +53,14 @@ # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) #endif +#ifndef PNGMINUS_UNUSED +/* Unused formal parameter warnings are silenced using the following macro + * which is expected to have no bad effects on performance (optimizing + * compilers will probably remove it entirely). + */ +# define PNGMINUS_UNUSED(param) (void)param +#endif + /* function prototypes */ int main (int argc, char *argv[]); @@ -443,7 +453,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file, if (png_pixels != (unsigned char*) NULL) free (png_pixels); - PNG_UNUSED(raw) /* to quiet a Coverity defect */ + PNGMINUS_UNUSED(raw); /* to quiet a Coverity defect */ return TRUE; } /* end of source */ diff --git a/contrib/pngminus/pnm2png.c b/contrib/pngminus/pnm2png.c index 1b550b8cf..229813666 100644 --- a/contrib/pngminus/pnm2png.c +++ b/contrib/pngminus/pnm2png.c @@ -7,6 +7,7 @@ * version 1.2 - 2017.04.22 - Add buffer-size check * 1.3 - 2017.08.24 - Fix potential overflow in buffer-size check * (Glenn Randers-Pehrson) + * 1.4 - 2017.08.28 - Add PNGMINUS_UNUSED (Christian Hesse) * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, @@ -50,6 +51,15 @@ # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) #endif +#ifndef PNGMINUS_UNUSED +/* Unused formal parameter warnings are silenced using the following macro + * which is expected to have no bad effects on performance (optimizing + * compilers will probably remove it entirely). + */ +# define PNGMINUS_UNUSED(param) (void)param +#endif + + /* function prototypes */ int main (int argc, char *argv[]); @@ -376,7 +386,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace, /* row_bytes is the width x number of channels x (bit-depth / 8) */ row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2); - if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes) + if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes)) { /* too big */ return FALSE; @@ -513,7 +523,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace, if (png_pixels != (unsigned char*) NULL) free (png_pixels); - PNG_UNUSED(raw) /* Quiet a Coverity defect */ + PNGMINUS_UNUSED(raw); /* Quiet a Coverity defect */ return TRUE; } /* end of pnm2png */ diff --git a/libpng-manual.txt b/libpng-manual.txt index 187774509..ec73d228d 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.29 - August 24, 2017 + libpng version 1.5.30beta01 - August 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.29 - August 24, 2017 + libpng versions 0.97, January 1998, through 1.5.30beta01 - August 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4525,7 +4525,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.29 are Y2K compliant. It is my belief that earlier +upward through 1.5.30beta01 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 diff --git a/libpng.3 b/libpng.3 index e1bef333a..b66bbee53 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 24, 2017" +.TH LIBPNG 3 "August 28, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.29 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.30beta01 .SH SYNOPSIS \fB #include \fP @@ -496,7 +496,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.29 - August 24, 2017 + libpng version 1.5.30beta01 - August 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -507,7 +507,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.29 - August 24, 2017 + libpng versions 0.97, January 1998, through 1.5.30beta01 - August 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5021,7 +5021,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.29 are Y2K compliant. It is my belief that earlier +upward through 1.5.30beta01 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 @@ -5176,7 +5176,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.29 - August 24, 2017: +Libpng version 1.5.30beta01 - August 28, 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). @@ -5201,7 +5201,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.5.29, August 24, 2017, are +libpng versions 1.0.7, July 1, 2000 through 1.5.30beta01, August 28, 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 @@ -5325,7 +5325,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 24, 2017 +August 28, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8b3952ebf..4982a9075 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 24, 2017" +.TH LIBPNGPF 3 "August 28, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.29 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.30beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index bba08a0b6..1caa75021 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 24, 2017" +.TH PNG 5 "August 28, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6926a41e2..bae3d21a1 100644 --- a/png.c +++ b/png.c @@ -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_29 Your_png_h_is_not_version_1_5_29; +typedef png_libpng_version_1_5_30beta01 Your_png_h_is_not_version_1_5_30beta01; /* 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 @@ -656,14 +656,14 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.29 - August 24, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.5.30beta01 - August 28, 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.5.29 - August 24, 2017\ + return "libpng version 1.5.30beta01 - August 28, 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."; diff --git a/png.h b/png.h index da89af47d..cc37802b7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.29, August 24, 2017 + * libpng version 1.5.30beta01, August 28, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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.5.29, August 24, 2017: + * libpng versions 0.97, January 1998, through 1.5.30beta01, August 28, 2017: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000 through 1.5.29, August 24, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.5.30beta01, August 28, 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 @@ -235,13 +235,13 @@ * Y2K compliance in libpng: * ========================= * - * August 24, 2017 + * August 28, 2017 * * 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.29 are Y2K compliant. It is my belief that + * upward through 1.5.30beta01 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 @@ -302,9 +302,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.29" +#define PNG_LIBPNG_VER_STRING "1.5.30beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.29 - August 24, 2017\n" + " libpng version 1.5.30beta01 - August 28, 2017\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -312,13 +312,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 5 -#define PNG_LIBPNG_VER_RELEASE 29 +#define PNG_LIBPNG_VER_RELEASE 30 /* 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 @@ -335,7 +335,7 @@ #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. @@ -343,7 +343,7 @@ * 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 10529 /* 1.5.29 */ +#define PNG_LIBPNG_VER 10530 /* 1.5.30 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -465,7 +465,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_29; +typedef char* png_libpng_version_1_5_30beta01; /* 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 diff --git a/pngconf.h b/pngconf.h index 73df65e26..71c30deb0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.29, August 24, 2017 + * libpng version 1.5.30beta01, August 28, 2017 * * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index d64646c24..309e539c8 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2121,4 +2121,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_29 Your_png_h_is_not_version_1_5_29; +typedef png_libpng_version_1_5_30beta01 Your_png_h_is_not_version_1_5_30beta01; diff --git a/pngtrans.c b/pngtrans.c index e1ce0bd1b..95aa2d72a 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -653,7 +653,7 @@ png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info) */ unsigned int padding = ((8 - (row_info->pixel_depth & 7)) * (row_info->width & 7)) & 7; - png_bytep rp = png_ptr->row_buf + row_info->rowbytes; + png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1; switch (row_info->bit_depth) { diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index dfc686159..3aa442198 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.29 - August 24, 2017 +libpng version 1.5.30beta01 - August 28, 2017 Copyright (c) 2010,2013,2016 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3e1450307..39c927bd2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@