mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'local/libpng17' into libpng17

Browse Source
This commit is contained in:
John Bowler 2015-10-03 11:04:31 -07:00
commit 2cd6d56ff6
28 changed files with 113 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta66 - September 27, 2015 Libpng 1.7.0beta67 - October 2, 2015
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.7.0beta66.tar.xz (LZMA-compressed, recommended) 1.7.0beta67.tar.xz (LZMA-compressed, recommended)
1.7.0beta66.tar.gz 1.7.0beta67.tar.gz
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp170b66.7z (LZMA-compressed, recommended) lp170b67.7z (LZMA-compressed, recommended)
lp170b66.zip lp170b67.zip
Other information: Other information:
1.7.0beta66-README.txt 1.7.0beta67-README.txt
1.7.0beta66-LICENSE.txt 1.7.0beta67-LICENSE.txt
libpng-1.7.0beta66-*.asc (armored detached GPG signatures) libpng-1.7.0beta67-*.asc (armored detached GPG signatures)
Changes since the last public release (1.6.0): Changes since the last public release (1.6.0):
@ -871,7 +871,7 @@ Version 1.7.0beta65 [September 16, 2015]
(but not yet by the writer) (John Bowler). (but not yet by the writer) (John Bowler).
Implemented shared transform handling that is used throughout (John Bowler). Implemented shared transform handling that is used throughout (John Bowler).
Version 1.7.0beta66 [September 27, 2015] Version 1.7.0beta66 [October 2, 2015]
Enabled the low-bit-depth gray tests that were disabled in prior versions Enabled the low-bit-depth gray tests that were disabled in prior versions
of libpng because of problems that should have been fixed by the recent of libpng because of problems that should have been fixed by the recent
changes to libpng17. Enabling the tests revealed bugs in those changes changes to libpng17. Enabling the tests revealed bugs in those changes
@ -944,6 +944,8 @@ Version 1.7.0beta66 [September 27, 2015]
extended sBIT handling to the colormap code in the simplified API extended sBIT handling to the colormap code in the simplified API
which is separately implemented in pngread.c (John Bowler). which is separately implemented in pngread.c (John Bowler).
Version 1.7.0beta67 [October 2, 2015]
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

4
CHANGES
View File

@ -5170,7 +5170,7 @@ Version 1.7.0beta65 [September 16, 2015]
(but not yet by the writer) (John Bowler). (but not yet by the writer) (John Bowler).
Implemented shared transform handling that is used throughout (John Bowler). Implemented shared transform handling that is used throughout (John Bowler).
Version 1.7.0beta66 [September 27, 2015] Version 1.7.0beta66 [October 2, 2015]
Enabled the low-bit-depth gray tests that were disabled in prior versions Enabled the low-bit-depth gray tests that were disabled in prior versions
of libpng because of problems that should have been fixed by the recent of libpng because of problems that should have been fixed by the recent
changes to libpng17. Enabling the tests revealed bugs in those changes changes to libpng17. Enabling the tests revealed bugs in those changes
@ -5243,6 +5243,8 @@ Version 1.7.0beta66 [September 27, 2015]
extended sBIT handling to the colormap code in the simplified API extended sBIT handling to the colormap code in the simplified API
which is separately implemented in pngread.c (John Bowler). which is separately implemented in pngread.c (John Bowler).
Version 1.7.0beta67 [October 2, 2015]
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

2
CMakeLists.txt
View File

@ -261,7 +261,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS # SET UP LINKS
if(PNG_SHARED) if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta66 # VERSION 17.${PNGLIB_RELEASE}.1.7.0beta67
VERSION 17.${PNGLIB_RELEASE}.0 VERSION 17.${PNGLIB_RELEASE}.0
SOVERSION 17 SOVERSION 17
CLEAN_DIRECT_OUTPUT 1) CLEAN_DIRECT_OUTPUT 1)

4
LICENSE
View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta66, September 18, 2015, are libpng versions 1.0.7, July 1, 2000, through 1.7.0beta67, October 2, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6 distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors: with the following individuals added to the list of Contributing Authors:
@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
September 18, 2015 October 2, 2015

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.7.0beta66 - September 18, 2015 (shared library 17.0) README for libpng version 1.7.0beta67 - October 2, 2015 (shared library 17.0)
See the note about version numbers near the top of png.h See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng. See INSTALL for instructions on how to install libpng.

4
configure.ac
View File

@ -18,7 +18,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here: dnl Version number stuff here:
AC_INIT([libpng],[1.7.0beta66],[png-mng-implement@lists.sourceforge.net]) AC_INIT([libpng],[1.7.0beta67],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts]) AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign') # libpng does not follow GNU file name conventions (hence 'foreign')
@ -40,7 +40,7 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2]) dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake dnl stop configure from automagically running automake
PNGLIB_VERSION=1.7.0beta66 PNGLIB_VERSION=1.7.0beta67
PNGLIB_MAJOR=1 PNGLIB_MAJOR=1
PNGLIB_MINOR=7 PNGLIB_MINOR=7
PNGLIB_RELEASE=0 PNGLIB_RELEASE=0

57
contrib/gregbook/readpng2.c
View File

@ -4,7 +4,7 @@
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. Copyright (c) 1998-2015 Greg Roelofs. All rights reserved.
This software is provided "as is," without warranty of any kind, This software is provided "as is," without warranty of any kind,
express or implied. In no event shall the author or contributors express or implied. In no event shall the author or contributors
@ -51,6 +51,11 @@
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---------------------------------------------------------------------------
Changelog:
%RDATE% - Check return value of png_get_bKGD() (Glenn R-P)
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
@ -104,7 +109,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
/* could also replace libpng warning-handler (final NULL), but no need: */ /* could also replace libpng warning-handler (final NULL), but no need: */
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr, png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), mainprog_ptr,
readpng2_error_handler, readpng2_warning_handler); readpng2_error_handler, readpng2_warning_handler);
if (!png_ptr) if (!png_ptr)
return 4; /* out of memory */ return 4; /* out of memory */
@ -261,36 +266,38 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr)
/* since we know we've read all of the PNG file's "header" (i.e., up /* since we know we've read all of the PNG file's "header" (i.e., up
* to IDAT), we can check for a background color here */ * to IDAT), we can check for a background color here */
if (mainprog_ptr->need_bgcolor && if (mainprog_ptr->need_bgcolor)
png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD))
{ {
png_color_16p pBackground; png_color_16p pBackground;
/* it is not obvious from the libpng documentation, but this function /* it is not obvious from the libpng documentation, but this function
* takes a pointer to a pointer, and it always returns valid red, * takes a pointer to a pointer, and it always returns valid red,
* green and blue values, regardless of color_type: */ * green and blue values, regardless of color_type: */
png_get_bKGD(png_ptr, info_ptr, &pBackground); if (png_get_bKGD(png_ptr, info_ptr, &pBackground))
{
/* however, it always returns the raw bKGD data, regardless of any /* however, it always returns the raw bKGD data, regardless of any
* bit-depth transformations, so check depth and adjust if necessary */ * bit-depth transformations, so check depth and adjust if necessary
if (bit_depth == 16) { */
mainprog_ptr->bg_red = pBackground->red >> 8; if (bit_depth == 16) {
mainprog_ptr->bg_green = pBackground->green >> 8; mainprog_ptr->bg_red = pBackground->red >> 8;
mainprog_ptr->bg_blue = pBackground->blue >> 8; mainprog_ptr->bg_green = pBackground->green >> 8;
} else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { mainprog_ptr->bg_blue = pBackground->blue >> 8;
if (bit_depth == 1) } else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
mainprog_ptr->bg_red = mainprog_ptr->bg_green = if (bit_depth == 1)
mainprog_ptr->bg_blue = pBackground->gray? 255 : 0; mainprog_ptr->bg_red = mainprog_ptr->bg_green =
else if (bit_depth == 2) mainprog_ptr->bg_blue = pBackground->gray? 255 : 0;
mainprog_ptr->bg_red = mainprog_ptr->bg_green = else if (bit_depth == 2)
mainprog_ptr->bg_blue = (255/3) * pBackground->gray; mainprog_ptr->bg_red = mainprog_ptr->bg_green =
else /* bit_depth == 4 */ mainprog_ptr->bg_blue = (255/3) * pBackground->gray;
mainprog_ptr->bg_red = mainprog_ptr->bg_green = else /* bit_depth == 4 */
mainprog_ptr->bg_blue = (255/15) * pBackground->gray; mainprog_ptr->bg_red = mainprog_ptr->bg_green =
} else { mainprog_ptr->bg_blue = (255/15) * pBackground->gray;
mainprog_ptr->bg_red = (uch)pBackground->red; } else {
mainprog_ptr->bg_green = (uch)pBackground->green; mainprog_ptr->bg_red = (uch)pBackground->red;
mainprog_ptr->bg_blue = (uch)pBackground->blue; mainprog_ptr->bg_green = (uch)pBackground->green;
mainprog_ptr->bg_blue = (uch)pBackground->blue;
}
} }
} }

8
libpng-manual.txt
View File

@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.7.0beta66 - September 18, 2015 libpng version 1.7.0beta67 - October 2, 2015
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.7.0beta66 - September 18, 2015 libpng versions 0.97, January 1998, through 1.7.0beta67 - October 2, 2015
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -5317,13 +5317,13 @@ Other rules can be inferred by inspecting the libpng source.
XVII. Y2K Compliance in libpng XVII. Y2K Compliance in libpng
September 18, 2015 October 2, 2015
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.7.0beta66 are Y2K compliant. It is my belief that earlier upward through 1.7.0beta67 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer Libpng only has two year fields. One is a 2-byte unsigned integer

20
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "September 18, 2015" .TH LIBPNG 3 "October 2, 2015"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta66 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta67
.SH SYNOPSIS .SH SYNOPSIS
\fB \fB
#include <png.h>\fP #include <png.h>\fP
@ -498,7 +498,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT .SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.7.0beta66 - September 18, 2015 libpng version 1.7.0beta67 - October 2, 2015
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net> <glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -509,7 +509,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on: Based on:
libpng versions 0.97, January 1998, through 1.7.0beta66 - September 18, 2015 libpng versions 0.97, January 1998, through 1.7.0beta67 - October 2, 2015
Updated and distributed by Glenn Randers-Pehrson Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -5815,13 +5815,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVII. Y2K Compliance in libpng .SH XVII. Y2K Compliance in libpng
September 18, 2015 October 2, 2015
Since the PNG Development group is an ad-hoc body, we can't make Since the PNG Development group is an ad-hoc body, we can't make
an official declaration. an official declaration.
This is your unofficial assurance that libpng from version 0.71 and This is your unofficial assurance that libpng from version 0.71 and
upward through 1.7.0beta66 are Y2K compliant. It is my belief that earlier upward through 1.7.0beta67 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant. versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer Libpng only has two year fields. One is a 2-byte unsigned integer
@ -6080,7 +6080,7 @@ the first widely used release:
1.6.18 16 10618 16.so.16.18[.0] 1.6.18 16 10618 16.so.16.18[.0]
1.6.19beta01 16 10619 16.so.16.19[.0] 1.6.19beta01 16 10619 16.so.16.19[.0]
1.7.0alpha01-10 17 10700 17.so.17.0[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0]
1.7.0beta01-66 17 10700 17.so.17.0[.0] 1.7.0beta01-67 17 10700 17.so.17.0[.0]
Henceforth the source version will match the shared-library minor Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be and patch numbers; the shared-library major version number will be
@ -6137,7 +6137,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation. Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.7.0beta66 - September 18, 2015: Libpng version 1.7.0beta67 - October 2, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -6160,7 +6160,7 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta66, September 18, 2015, are libpng versions 1.0.7, July 1, 2000, through 1.7.0beta67, October 2, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6 distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors: with the following individuals added to the list of Contributing Authors:
@ -6254,7 +6254,7 @@ the additional disclaimers inserted at version 1.0.7.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
September 18, 2015 October 2, 2015
.\" end of man page .\" end of man page

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "September 18, 2015" .TH LIBPNGPF 3 "October 2, 2015"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta66 libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta67
(private functions) (private functions)
.SH SYNOPSIS .SH SYNOPSIS
\fB#include \fI"pngpriv.h" \fB#include \fI"pngpriv.h"

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "September 18, 2015" .TH PNG 5 "October 2, 2015"
.SH NAME .SH NAME
png \- Portable Network Graphics (PNG) format png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION .SH DESCRIPTION

6
png.c
View File

@ -15,7 +15,7 @@
#define PNG_SRC_FILE PNG_SRC_FILE_png #define PNG_SRC_FILE PNG_SRC_FILE_png
/* Generate a compiler error if there is an old png.h in the search path. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_7_0beta66 Your_png_h_is_not_version_1_7_0beta66; typedef png_libpng_version_1_7_0beta67 Your_png_h_is_not_version_1_7_0beta67;
/* Tells libpng that we have already handled the first "num_bytes" bytes /* 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 * of the PNG file signature. If the PNG data is embedded into another
@ -699,13 +699,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta66 - September 18, 2015" PNG_STRING_NEWLINE \ "libpng version 1.7.0beta67 - October 2, 2015" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE; PNG_STRING_NEWLINE;
# else # else
return "libpng version 1.7.0beta66 - September 18, 2015\ return "libpng version 1.7.0beta67 - October 2, 2015\
Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

20
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library /* png.h - header file for PNG reference library
* *
* libpng version 1.7.0beta66, September 18, 2015 * libpng version 1.7.0beta67, October 2, 2015
* *
* Copyright (c) 1998-2015 Glenn Randers-Pehrson * Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -12,7 +12,7 @@
* Authors and maintainers: * Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * 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.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.7.0beta66, September 18, 2015: Glenn * libpng versions 0.97, January 1998, through 1.7.0beta67, October 2, 2015: Glenn
* See also "Contributing Authors", below. * See also "Contributing Authors", below.
* *
* Note about libpng version numbers: * Note about libpng version numbers:
@ -220,7 +220,7 @@
* 1.6.18rc01-03 16 10618 16.so.16.18[.0] * 1.6.18rc01-03 16 10618 16.so.16.18[.0]
* 1.6.18 16 10618 16.so.16.18[.0] * 1.6.18 16 10618 16.so.16.18[.0]
* 1.7.0alpha01-10 17 10700 17.so.17.0[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0]
* 1.7.0beta01-66 17 10700 17.so.17.0[.0] * 1.7.0beta01-67 17 10700 17.so.17.0[.0]
* *
* Henceforth the source version will match the shared-library major * Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be * and minor numbers; the shared-library major version number will be
@ -252,7 +252,7 @@
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* *
* libpng versions 1.0.7, July 1, 2000, through 1.7.0beta66, September 18, 2015, are * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta67, October 2, 2015, are
* Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.0.6 * distributed according to the same disclaimer and license as libpng-1.0.6
* with the following individuals added to the list of Contributing Authors: * with the following individuals added to the list of Contributing Authors:
@ -361,13 +361,13 @@
* Y2K compliance in libpng: * Y2K compliance in libpng:
* ========================= * =========================
* *
* September 18, 2015 * October 2, 2015
* *
* Since the PNG Development group is an ad-hoc body, we can't make * Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration. * an official declaration.
* *
* This is your unofficial assurance that libpng from version 0.71 and * This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.7.0beta66 are Y2K compliant. It is my belief that * upward through 1.7.0beta67 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant. * earlier versions were also Y2K compliant.
* *
* Libpng only has two year fields. One is a 2-byte unsigned integer * Libpng only has two year fields. One is a 2-byte unsigned integer
@ -429,9 +429,9 @@
*/ */
/* Version information for png.h - this should match the version in png.c */ /* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta66" #define PNG_LIBPNG_VER_STRING "1.7.0beta67"
#define PNG_HEADER_VERSION_STRING \ #define PNG_HEADER_VERSION_STRING \
" libpng version 1.7.0beta66 - September 18, 2015\n" " libpng version 1.7.0beta67 - October 2, 2015\n"
#define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17 #define PNG_LIBPNG_VER_DLLNUM 17
@ -445,7 +445,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero: * PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/ */
#define PNG_LIBPNG_VER_BUILD 66 #define PNG_LIBPNG_VER_BUILD 67
/* Release Status */ /* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_ALPHA 1
@ -705,7 +705,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h /* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number. * do not agree upon the version number.
*/ */
typedef char* png_libpng_version_1_7_0beta66; typedef char* png_libpng_version_1_7_0beta67;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
* *

2
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.7.0beta66, September 18, 2015 * libpng version 1.7.0beta67, October 2, 2015
* *
* Copyright (c) 1998-2015 Glenn Randers-Pehrson * Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

16
pngread.c
View File

@ -1816,10 +1816,6 @@ png_create_colormap_entry(png_image_read_control *display,
*/ */
if (use_sBIT) if (use_sBIT)
{ {
#ifdef __COVERITY__
/* Coverity says red, green, blue might be 16-bit values */
png_affirmpp(png_ptr, red < 256 && green < 256 && blue < 256);
#endif
red = convert_to_linear(display, red, display->sBIT[0]); red = convert_to_linear(display, red, display->sBIT[0]);
green = convert_to_linear(display, green, display->sBIT[1]); green = convert_to_linear(display, green, display->sBIT[1]);
@ -2257,8 +2253,15 @@ png_image_read_colormap(png_voidp argument)
* supplied background color when it is used. * supplied background color when it is used.
*/ */
else else
{
#ifdef __COVERITY__
/* Coverity says back_r|g|b might be 16-bit values */
png_affirmpp(png_ptr, back_r < 256 && back_g < 256 &&
back_b < 256);
#endif
png_create_colormap_entry(display, i, back_r, back_g, back_b, png_create_colormap_entry(display, i, back_r, back_g, back_b,
back_alpha, output_encoding); back_alpha, output_encoding);
}
} }
/* We need libpng to preserve the original encoding. */ /* We need libpng to preserve the original encoding. */
@ -2365,6 +2368,11 @@ png_image_read_colormap(png_voidp argument)
/* And set (overwrite) color-map entry 254 to the actual /* And set (overwrite) color-map entry 254 to the actual
* background color at full precision. * background color at full precision.
*/ */
#ifdef __COVERITY__
/* Coverity says back_r|g|b might be 16-bit values */
png_affirmpp(png_ptr, back_r < 256 && back_g < 256 &&
back_b < 256);
#endif
png_create_colormap_entry(display, 254, back_r, back_g, back_b, png_create_colormap_entry(display, 254, back_r, back_g, back_b,
back_alpha, output_encoding); back_alpha, output_encoding);
} }

2
pngtest.c
View File

@ -2017,4 +2017,4 @@ main(void)
#endif #endif
/* Generate a compiler error if there is an old png.h in the search path. */ /* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_7_0beta66 Your_png_h_is_not_version_1_7_0beta66; typedef png_libpng_version_1_7_0beta67 Your_png_h_is_not_version_1_7_0beta67;

2
pngtrans.c
View File

@ -1543,7 +1543,7 @@ png_do_byte_ops_down(png_transformp *transform, png_transform_controlp tc)
const png_uint_32 codes = tr->codes; const png_uint_32 codes = tr->codes;
png_uint_32 code = codes; png_uint_32 code = codes;
unsigned int size, hwm, i; unsigned int size, hwm, i;
png_byte output[32]; png_byte output[32] = { 0 };
/* This catches an empty codes array, which would cause all the input to /* This catches an empty codes array, which would cause all the input to
* be skipped and, potentially, a garbage output[] to be written (once) to * be skipped and, potentially, a garbage output[] to be written (once) to

2
projects/vstudio/readme.txt
View File

@ -1,7 +1,7 @@
VisualStudio instructions VisualStudio instructions
libpng version 1.7.0beta66 - September 18, 2015 libpng version 1.7.0beta67 - October 2, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson

2
projects/vstudio/zlib.props
View File

@ -2,7 +2,7 @@
<!-- <!--
* zlib.props - location of zlib source * zlib.props - location of zlib source
* *
* libpng version 1.7.0beta66 - September 18, 2015 * libpng version 1.7.0beta67 - October 2, 2015
* *
* Copyright (c) 1998-2011 Glenn Randers-Pehrson * Copyright (c) 1998-2011 Glenn Randers-Pehrson
* *

10
scripts/README.txt
View File

@ -1,9 +1,9 @@
Makefiles for libpng version 1.7.0beta66 - September 18, 2015 Makefiles for libpng version 1.7.0beta67 - October 2, 2015
pnglibconf.h.prebuilt => Stores configuration settings pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile makefile.linux => Linux/ELF makefile
(gcc, creates libpng17.so.17.1.7.0beta66) (gcc, creates libpng17.so.17.1.7.0beta67)
makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from ansi2knr (Requires ansi2knr.c from
@ -33,12 +33,12 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc, makefile.sggcc => Silicon Graphics (gcc,
creates libpng17.so.17.1.7.0beta66) creates libpng17.so.17.1.7.0beta67)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc, makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng17.so.17.1.7.0beta66) creates libpng17.so.17.1.7.0beta67)
makefile.so9 => Solaris 9 makefile (gcc, makefile.so9 => Solaris 9 makefile (gcc,
creates libpng17.so.17.1.7.0beta66) creates libpng17.so.17.1.7.0beta67)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile makefile.32sunu => Sun Ultra 32-bit makefile

2
scripts/def.c
View File

@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN "" PNG_DFN ""
PNG_DFN "EXPORTS" PNG_DFN "EXPORTS"
PNG_DFN ";Version 1.7.0beta66" PNG_DFN ";Version 1.7.0beta67"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\ #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"

2
scripts/libpng-config-head.in
View File

@ -11,7 +11,7 @@
# Modeled after libxml-config. # Modeled after libxml-config.
version=1.7.0beta66 version=1.7.0beta67
prefix="" prefix=""
libdir="" libdir=""
libs="" libs=""

2
scripts/libpng.pc.in
View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng17
Name: libpng Name: libpng
Description: Loads and saves PNG files Description: Loads and saves PNG files
Version: 1.7.0beta66 Version: 1.7.0beta67
Libs: -L${libdir} -lpng17 Libs: -L${libdir} -lpng17
Cflags: -I${includedir} Cflags: -I${includedir}

2
scripts/makefile.ne12bsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng17
LIB= png17 LIB= png17
SHLIB_MAJOR= 0 SHLIB_MAJOR= 0
SHLIB_MINOR= 1.7.0beta66 SHLIB_MINOR= 1.7.0beta67
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.netbsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png LIB= png
SHLIB_MAJOR= 17 SHLIB_MAJOR= 17
SHLIB_MINOR= 1.7.0beta66 SHLIB_MINOR= 1.7.0beta67
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c pngwtran.c pngmem.c pngerror.c pngpread.c

2
scripts/makefile.openbsd
View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 17 SHLIB_MAJOR= 17
SHLIB_MINOR= 1.7.0beta66 SHLIB_MINOR= 1.7.0beta67
LIB= png LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

4
scripts/pnglibconf.h.prebuilt
View File

@ -1,8 +1,8 @@
/* libpng 1.7.0beta66 STANDARD API DEFINITION */ /* libpng 1.7.0beta67 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */ /* pnglibconf.h - library build configuration */
/* Libpng version 1.7.0beta66 - September 18, 2015 */ /* Libpng version 1.7.0beta67 - October 2, 2015 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */

2
scripts/symbols.def
View File

@ -1,4 +1,4 @@
;Version 1.7.0beta66 ;Version 1.7.0beta67
;-------------------------------------------------------------- ;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file ; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng ; Contains all the symbols that can be exported from libpng