Skip to content

Commit

Permalink
[libpng16] Imported from libpng-1.6.35beta01.tar
Browse files Browse the repository at this point in the history
  • Loading branch information
Glenn Randers-Pehrson committed Mar 6, 2018
1 parent 3fecfea commit 0e06b59
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 37 deletions.
7 changes: 5 additions & 2 deletions ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Libpng 1.6.35beta01 - January 8, 2018
Libpng 1.6.35beta01 - March 6, 2018

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 All @@ -24,7 +24,7 @@ Other information:

Changes since the last public release (1.6.34):

Version 1.6.35beta01 [January 8, 2018]
Version 1.6.35beta01 [March 6, 2018]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Added calls to png_set_*() transforms commonly used by browsers to
Expand All @@ -33,6 +33,9 @@ Version 1.6.35beta01 [January 8, 2018]
Fixed miscellaneous typos (Patch by github user "luzpaz")
Change "ASM C" to "C ASM" in CMakeLists.txt
Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
Added hardware optimization directories to zip and 7z distributions.
Fixed incorrect bitmask for options.
Fixed many spelling typos.

Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
Expand Down
5 changes: 4 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6040,7 +6040,7 @@ Version 1.6.33 [September 28, 2017]
Version 1.6.34 [September 29, 2017]
Removed contrib/pngsuite/i*.png; some of them caused test failures.

Version 1.6.35beta01 [January 8, 2018]
Version 1.6.35beta01 [March 6, 2018]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Added calls to png_set_*() transforms commonly used by browsers to
Expand All @@ -6049,6 +6049,9 @@ Version 1.6.35beta01 [January 8, 2018]
Fixed miscellaneous typos (Patch by github user "luzpaz").
Change "ASM C" to "C ASM" in CMakeLists.txt
Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
Added hardware optimization directories to zip and 7z distributions.
Fixed incorrect bitmask for options.
Fixed many spelling typos.

Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
Expand Down
4 changes: 2 additions & 2 deletions 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.35beta01, January 8, 2018 are
libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, March 6, 2018 are
Copyright (c) 2000-2002, 2004, 2006-2018 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 @@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and

Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 8, 2018
March 6, 2018
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.35beta01 - September 29, 2017 (shared library 16.0)
README for libpng version 1.6.35beta01 - March 6, 2018 (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 contrib/oss-fuzz/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Last changed in libpng 1.6.35 [October 7, 2017]
# Last changed in libpng 1.6.35 [March 6, 2018]
#
# Revisions by Glenn Randers-Pehrson, 2017:
# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
Expand Down
6 changes: 3 additions & 3 deletions contrib/oss-fuzz/libpng_read_fuzzer.cc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// libpng_read_fuzzer.cc
// Copyright 2017 Glenn Randers-Pehrson
// Copyright 2017-2018 Glenn Randers-Pehrson
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that may
// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE

// Last changed in libpng 1.6.35 [October 30, 2017]
// Last changed in libpng 1.6.35 [March 6, 2018]

// The modifications in 2017 by Glenn Randers-Pehrson include
// 1. addition of a PNG_CLEANUP macro,
Expand Down Expand Up @@ -165,7 +165,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
png_set_gray_to_rgb(png_handler.png_ptr);
png_set_expand(png_handler.png_ptr);
png_set_packing(png_handler.png_ptr);
// png_set_scale_16(png_handler.png_ptr);
png_set_scale_16(png_handler.png_ptr);
png_set_tRNS_to_alpha(png_handler.png_ptr);

int passes = png_set_interlace_handling(png_handler.png_ptr);
Expand Down
9 changes: 9 additions & 0 deletions contrib/pngsuite/bad_interlace_conversions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
basn0g01.png
basn0g02.png
basn0g04.png
basn3p01.png
basn3p02.png
basn3p04.png
ftbbn0g01.png
ftbbn0g02.png
ftbbn0g04.png
2 changes: 1 addition & 1 deletion contrib/powerpc-vsx/README
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ everything should be static. It must define the function:

static int png_have_vsx(png_structp png_ptr);

That function must return 1 if ARM NEON instructions are supported, 0 if not.
That function must return 1 if POWERPC_VSX instructions are supported, 0 if not.
It must not execute png_error unless it detects a bug. A png_error will prevent
the reading of the PNG and in the future, writing too.

Expand Down
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.35beta01 - January 8, 2018
libpng version 1.6.35beta01 - March 6, 2018
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.35beta01 - January 8, 2018
libpng versions 0.97, January 1998, through 1.6.35beta01 - March 6, 2018
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 "January 8, 2018"
.TH LIBPNG 3 "March 6, 2018"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.35beta01
.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.35beta01 - January 8, 2018
libpng version 1.6.35beta01 - March 6, 2018
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.35beta01 - January 8, 2018
libpng versions 0.97, January 1998, through 1.6.35beta01 - March 6, 2018
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2017 Glenn Randers-Pehrson

Expand Down Expand Up @@ -6090,7 +6090,7 @@ possible without all of you.

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

Libpng version 1.6.35beta01 - January 8, 2018:
Libpng version 1.6.35beta01 - March 6, 2018:
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 @@ -6115,7 +6115,7 @@ this sentence.

This code is released under the libpng license.

libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, January 8, 2018 are
libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, March 6, 2018 are
Copyright (c) 2000-2002, 2004, 2006-2018 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 @@ -6243,7 +6243,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

Glenn Randers-Pehrson
glennrp at users.sourceforge.net
January 8, 2018
March 6, 2018

.\" 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.35beta01 - January 8, 2018" PNG_STRING_NEWLINE \
"libpng version 1.6.35beta01 - March 6, 2018" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 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.35beta01 - January 8, 2018\
return "libpng version 1.6.35beta01 - March 6, 2018\
Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
Expand Down
14 changes: 7 additions & 7 deletions png.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/* png.h - header file for PNG reference library
*
* libpng version 1.6.35beta01, September 29, 2017
* libpng version 1.6.35beta01, March 6, 2018
*
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
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.35beta01, September 29, 2017:
* libpng versions 0.97, January 1998, through 1.6.35beta01, March 6, 2018:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
Expand All @@ -25,8 +25,8 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, September 29, 2017 are
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
* libpng versions 1.0.7, July 1, 2000 through 1.6.35beta01, March 6, 2018 are
* Copyright (c) 2000-2002, 2004, 2006-2018 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
* added to the list of Contributing Authors:
Expand Down Expand Up @@ -241,7 +241,7 @@
* Y2K compliance in libpng:
* =========================
*
* September 29, 2017
* March 6, 2018
*
* 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.35beta01"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35beta01 - September 29, 2017\n"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35beta01 - March 6, 2018\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.35beta01, September 29, 2017
* libpng version 1.6.35beta01, March 6, 2018
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
Expand Down
5 changes: 2 additions & 3 deletions pngrtran.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.6.35 [(PENDING RELEASE)]
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
Expand Down Expand Up @@ -4755,8 +4755,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
&(png_ptr->trans_color));

else
png_do_expand(row_info, png_ptr->row_buf + 1,
(png_const_color_16p)NULL);
png_do_expand(row_info, png_ptr->row_buf + 1, NULL);
}
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion pngset.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));

if (num_palette > 0)
memcpy(png_ptr->palette, palette, (unsigned int)PNG_MAX_PALETTE_LENGTH *
memcpy(png_ptr->palette, palette, (unsigned int)num_palette *
(sizeof (png_color)));
info_ptr->palette = png_ptr->palette;
info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
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.35beta01 - September 29, 2017
libpng version 1.6.35beta01 - March 6, 2018

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.35beta01 - September 29, 2017
* libpng version 1.6.35beta01 - March 6, 2018
*
* 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.35beta01 - September 29, 2017
Makefiles for libpng version 1.6.35beta01 - March 6, 2018

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.35beta01 - September 29, 2017 */
/* Libpng version 1.6.35beta01 - March 6, 2018 */

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

Expand Down

0 comments on commit 0e06b59

Please sign in to comment.