Skip to content

Commit

Permalink
[libpng16] Imported from libpng-1.6.32beta11.tar
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn Randers-Pehrson committed Aug 7, 2017
1 parent 7653aaa commit fa2f722
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 25 deletions.
4 changes: 2 additions & 2 deletions ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Libpng 1.6.32beta11 - August 6, 2017
Libpng 1.6.32beta11 - August 7, 2017

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.
Expand Down Expand Up @@ -80,7 +80,7 @@ Version 1.6.32beta10 [August 5, 2017]
Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the
num_exif argument to png_get_eXIf_1() (Github Issue 171).

Version 1.6.32beta11 [August 6, 2017]
Version 1.6.32beta11 [August 7, 2017]
Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().
Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.
Make pngtest --strict, --relax, --xfail options imply -m (multiple).
Expand Down
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -5963,7 +5963,7 @@ Version 1.6.32beta10 [August 5, 2017]
Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the
num_exif argument to png_get_eXIf_1() (Github Issue 171).

Version 1.6.32beta11 [August 6, 2017]
Version 1.6.32beta11 [August 7, 2017]
Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().
Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.
Make pngtest --strict, --relax, --xfail options imply -m (multiple).
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 5, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, 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 5, 2017 (shared library 16.0)
README for libpng version 1.6.32beta11 - 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
Binary file removed contrib/testpngs/crashers/bad_iccp.png
Binary file not shown.
4 changes: 2 additions & 2 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 5, 2017
libpng version 1.6.32beta11 - 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 5, 2017
libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down
12 changes: 6 additions & 6 deletions libpng.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH LIBPNG 3 "August 5, 2017"
.TH LIBPNG 3 "August 7, 2017"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.32beta11
.SH SYNOPSIS
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 5, 2017
libpng version 1.6.32beta11 - 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 5, 2017
libpng versions 0.97, January 1998, through 1.6.32beta11 - August 7, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

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 5, 2017:
Libpng version 1.6.32beta11 - 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 5, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, 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 @@ -6234,7 +6234,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

Glenn Randers-Pehrson
glennrp at users.sourceforge.net
August 5, 2017
August 7, 2017

.\" end of man page

4 changes: 2 additions & 2 deletions png.c
Original file line number Diff line number Diff line change
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 5, 2017" PNG_STRING_NEWLINE \
"libpng version 1.6.32beta11 - 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 5, 2017\
return "libpng version 1.6.32beta11 - 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
10 changes: 5 additions & 5 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 5, 2017
* libpng version 1.6.32beta11, 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 5, 2017:
* libpng versions 0.97, January 1998, through 1.6.32beta11, 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 5, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.32beta11, 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 @@ -241,7 +241,7 @@
* Y2K compliance in libpng:
* =========================
*
* August 5, 2017
* August 7, 2017
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
Expand Down Expand Up @@ -310,7 +310,7 @@

/* 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 5, 2017\n"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.32beta11 - August 7, 2017\n"

#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
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 5, 2017
* libpng version 1.6.32beta11, August 7, 2017
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
Expand Down
1 change: 1 addition & 0 deletions pngread.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
png_error(png_ptr, "Invalid attempt to read row data");

/* Fill the row with IDAT data: */
png_ptr->row_buf[0]=255; /* to force error if no data was found */
png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);

if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
Expand Down
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 5, 2017
libpng version 1.6.32beta11 - 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 5, 2017
* libpng version 1.6.32beta11 - August 7, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
Expand Down
2 changes: 1 addition & 1 deletion scripts/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
Expand Down
2 changes: 1 addition & 1 deletion scripts/pnglibconf.h.prebuilt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* pnglibconf.h - library build configuration */

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

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

Expand Down

0 comments on commit fa2f722

Please sign in to comment.