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 branch 'libpng17' of ../../libpng into libpng17

Browse Source
This commit is contained in:
John Bowler 2015-11-24 18:17:31 -08:00
commit 1c514557b6
32 changed files with 97 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta69 - November 24, 2015
Libpng 1.7.0beta70 - November 24, 2015
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.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.7.0beta69.tar.xz (LZMA-compressed, recommended)
1.7.0beta69.tar.gz
1.7.0beta70.tar.xz (LZMA-compressed, recommended)
1.7.0beta70.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
lp170b69.7z (LZMA-compressed, recommended)
lp170b69.zip
lp170b70.7z (LZMA-compressed, recommended)
lp170b70.zip
Other information:
1.7.0beta69-README.txt
1.7.0beta69-LICENSE.txt
libpng-1.7.0beta69-*.asc (armored detached GPG signatures)
1.7.0beta70-README.txt
1.7.0beta70-LICENSE.txt
libpng-1.7.0beta70-*.asc (armored detached GPG signatures)
Changes since the last public release (1.6.0):
@ -970,8 +970,9 @@ Version 1.7.0beta69 [November 24, 2015]
png_handle_pCAL() (Bug report by John Regehr).
Avoid conditionally compiling parts of statements in png.c (suggested
by flaviommedeiros).
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
not info_ptr.
Fixed incorrect implementation of png_set_PLTE() that uses png_ptr
not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126
vulnerability.
Added pngvalid --transform --interlace test. This increases code
coverage by generating test cases with smaller length rows as a
result of the interlacing. Without this packswap handling was
@ -1021,6 +1022,8 @@ Version 1.7.0beta69 [November 24, 2015]
Temporarily disabled filter selection while writing, and temporarily
replaced pngtest.png accordingly.
Version 1.7.0beta70 [November 24, 2015]
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

7
CHANGES
View File

@ -5269,8 +5269,9 @@ Version 1.7.0beta69 [November 24, 2015]
png_handle_pCAL() (Bug report by John Regehr).
Avoid conditionally compiling parts of statements in png.c (suggested
by flaviommedeiros).
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr
not info_ptr.
Fixed incorrect implementation of png_set_PLTE() that uses png_ptr
not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126
vulnerability.
Added pngvalid --transform --interlace test. This increases code
coverage by generating test cases with smaller length rows as a
result of the interlacing. Without this packswap handling was
@ -5319,6 +5320,8 @@ Version 1.7.0beta69 [November 24, 2015]
we are seeing.
Temporarily disabled filter selection while writing, and temporarily
replaced pngtest.png accordingly.
Version 1.7.0beta70 [November 24, 2015]
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

2
CMakeLists.txt
View File

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

2
LICENSE
View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 24, 2015, are
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta70, November 24, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 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

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.7.0beta69 - November 24, 2015 (shared library 17.0)
README for libpng version 1.7.0beta70 - November 24, 2015 (shared library 17.0)
See the note about version numbers near the top of png.h
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:
AC_INIT([libpng],[1.7.0beta69],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.7.0beta70],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# 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 stop configure from automagically running automake
PNGLIB_VERSION=1.7.0beta69
PNGLIB_VERSION=1.7.0beta70
PNGLIB_MAJOR=1
PNGLIB_MINOR=7
PNGLIB_RELEASE=0

6
libpng-manual.txt
View File

@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.7.0beta69 - November 24, 2015
libpng version 1.7.0beta70 - November 24, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
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:
libpng versions 0.97, January 1998, through 1.7.0beta69 - November 24, 2015
libpng versions 0.97, January 1998, through 1.7.0beta70 - November 24, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -5321,7 +5321,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.7.0beta69 are Y2K compliant. It is my belief that earlier
upward through 1.7.0beta70 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

12
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "November 24, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta69
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta70
.SH SYNOPSIS
\fB
#include <png.h>\fP
@ -498,7 +498,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.7.0beta69 - November 24, 2015
libpng version 1.7.0beta70 - November 24, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
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:
libpng versions 0.97, January 1998, through 1.7.0beta69 - November 24, 2015
libpng versions 0.97, January 1998, through 1.7.0beta70 - November 24, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@ -5819,7 +5819,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.7.0beta69 are Y2K compliant. It is my belief that earlier
upward through 1.7.0beta70 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
@ -5980,7 +5980,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.7.0beta69 - November 24, 2015:
Libpng version 1.7.0beta70 - November 24, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -6005,7 +6005,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 24, 2015, are
libpng versions 1.0.7, July 1, 2000, through 1.7.0beta70, November 24, 2015, are
Copyright (c) 2000-2002, 2004, 2006-2015 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

2
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "November 24, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta69
libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta70
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"

8
png.c
View File

@ -15,7 +15,7 @@
#define PNG_SRC_FILE PNG_SRC_FILE_png
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_7_0beta69 Your_png_h_is_not_version_1_7_0beta69;
typedef png_libpng_version_1_7_0beta70 Your_png_h_is_not_version_1_7_0beta70;
/* 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
@ -711,13 +711,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta69 - November 24, 2015" PNG_STRING_NEWLINE \
"libpng version 1.7.0beta70 - November 24, 2015" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2015 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.7.0beta69 - November 24, 2015\
return "libpng version 1.7.0beta70 - November 24, 2015\
Copyright (c) 1998-2015 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@ -2288,7 +2288,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
* Fall through to "no match".
*/
png_chunk_report(png_ptr,
"Not recognizing known sRGB profile that has been edited",
"Not recognizing known sRGB profile that has been edited",
PNG_CHUNK_WARNING);
break;
# endif

16
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.7.0beta69, November 24, 2015
* libpng version 1.7.0beta70, November 24, 2015
*
* Copyright (c) 1998-2015 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.7.0beta69, November 24, 2015:
* libpng versions 0.97, January 1998, through 1.7.0beta70, November 24, 2015:
* 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.7.0beta69, November 24, 2015, are
* libpng versions 1.0.7, July 1, 2000, through 1.7.0beta70, November 24, 2015, are
* Copyright (c) 2000-2002, 2004, 2006-2015 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
@ -224,7 +224,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.7.0beta69 are Y2K compliant. It is my belief that
* upward through 1.7.0beta70 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
@ -286,9 +286,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.7.0beta69"
#define PNG_LIBPNG_VER_STRING "1.7.0beta70"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.7.0beta69 - November 24, 2015\n"
" libpng version 1.7.0beta70 - November 24, 2015\n"
#define PNG_LIBPNG_VER_SONUM 17
#define PNG_LIBPNG_VER_DLLNUM 17
@ -302,7 +302,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 69
#define PNG_LIBPNG_VER_BUILD 70
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -562,7 +562,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_7_0beta69;
typedef char* png_libpng_version_1_7_0beta70;
/* 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
*
* libpng version 1.7.0beta69, November 24, 2015
* libpng version 1.7.0beta70, November 24, 2015
*
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngerror.c
View File

@ -788,7 +788,7 @@ png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
/* If control reaches this point, png_longjmp() must not return. The only
* choice is to terminate the whole process (or maybe the thread); to do
* this the ANSI-C abort() function is used unless a different method is
* this the ANSI-C abort() function is used unless a different method is
* implemented by overriding the default configuration setting for
* PNG_ABORT (see scripts/pnglibconf.dfa).
*

4
pngpread.c
View File

@ -411,7 +411,7 @@ png_push_read_process_IDAT(png_structp png_ptr, png_bytep *bufferp,
*/
{
png_alloc_size_t buffer_length;
if (buffer_lengthp != NULL)
buffer_length = *buffer_lengthp;
@ -620,7 +620,7 @@ png_push_read_process_IDAT(png_structp png_ptr, png_bytep *bufferp,
if (buffer_lengthp != NULL)
{
png_push_read_sync_zstream(png_ptr, bufferp, buffer_lengthp);
/* If the chunk_length is greater than 0 then there is extra data,
* report this once. Notice that for IDAT after the end of the
* stream we keep coming to this point and doing the skip.

12
pngrtran.c
View File

@ -593,7 +593,7 @@ png_do_read_unpack(png_transformp *transform, png_transform_controlp tc)
png_const_bytep sp = png_voidcast(png_const_bytep, tc->sp);
png_const_bytep ep = png_voidcast(png_const_bytep, tc->dp);
png_bytep dp = png_voidcast(png_bytep, tc->dp);
sp += PNG_TC_ROWBYTES(*tc) - 1; /* Start from end */
dp += tc->width; /* output bit depth is 8 */
@ -616,7 +616,7 @@ png_do_read_unpack(png_transformp *transform, png_transform_controlp tc)
if (shift == 0U)
--sp;
}
debug(shift == 0U);
break;
}
@ -1826,7 +1826,7 @@ png_log16bit(unsigned int x)
* D^g
* P = -----
* D^g-1
*
*
* (M x (D^g-1)) (1)
* R = (-----------)^(-)
* ( D^g ) (g)
@ -2159,7 +2159,7 @@ png_gamma_nxmbit_correct(unsigned int value, png_fixed_point gamma_val,
r = floor(mout * pow(r, gamma_val*.00001)+.5);
if (r < 1)
return 0U;
else if (r >= mout)
return mout;
@ -3854,7 +3854,7 @@ png_init_rgb_to_gray(png_transformp *transform, png_transform_controlp tc)
{
png_transformp tr_expand = png_push_transform(png_ptr,
sizeof (png_expand), png_init_expand, transform, NULL);
debug(*transform == tr_expand);
tr_expand->args |= PNG_EXPAND_tRNS;
png_init_expand(transform, tc);
@ -3869,7 +3869,7 @@ png_init_rgb_to_gray(png_transformp *transform, png_transform_controlp tc)
{
png_fixed_point red, green;
if (tr->coefficients_set)
{
red = tr->red_coefficient;

30
pngrutil.c
View File

@ -2472,7 +2472,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr)
/******************************************************************************
* UNKNOWN HANDLING LOGIC
*
*
* There are three ways an unknown chunk may arise:
*
* 1) Chunks not in the spec.
@ -2512,7 +2512,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr)
*
* In the read code PNG_READ_UNKNOWN_CHUNKS_SUPPORTED is set only if either (1)
* or (2) or both are supported.
*
*
*****************************************************************************/
#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
static int
@ -2742,10 +2742,10 @@ png_known_chunks[] =
* the hashed name.
*/
static const png_byte png_chunk_lut[64] =
{
10, 20, 7, 3, 0, 23, 8, 0, 0, 11, 24, 0, 0, 0, 0, 4,
12, 0, 0, 0, 13, 0, 0, 0, 25, 0, 0, 0, 2, 0, 0, 0,
0, 6, 17, 0, 15, 0, 5, 19, 26, 0, 0, 0, 18, 0, 0, 9,
{
10, 20, 7, 3, 0, 23, 8, 0, 0, 11, 24, 0, 0, 0, 0, 4,
12, 0, 0, 0, 13, 0, 0, 0, 25, 0, 0, 0, 2, 0, 0, 0,
0, 6, 17, 0, 15, 0, 5, 19, 26, 0, 0, 0, 18, 0, 0, 9,
1, 0, 21, 0, 22, 14, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0
};
@ -2802,7 +2802,7 @@ png_cache_known_unknown(png_structrp png_ptr, png_const_bytep add, int keep)
(keep == PNG_HANDLE_CHUNK_IF_SAFE &&
PNG_CHUNK_ANCILLARY(name)))
png_ptr->save_unknown |= 1U << i;
else /* PNG_HANDLE_CHUNK_NEVER || !SAFE */
png_ptr->save_unknown &= ~(1U << i);
# endif /* SAVE_UNKNOWN_CHUNKS */
@ -2993,7 +2993,7 @@ png_find_chunk_op(png_structrp png_ptr)
# endif /* READ_USER_CHUNKS */
# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
/* There is no per-chunk special handling set for this chunk
/* There is no per-chunk special handling set for this chunk
* (because of the test on known_unknown above) so only the
* default unknown handling behavior matters. We skip the chunk
* if the behavior is 'NEVER' or 'DEFAULT'. This is irrelevant
@ -3155,7 +3155,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
*
* The destination pointer (but not size) and how to handle intermediate
* passes are arguments to the API. The destination is the pointer to the
* entire row buffer, not just the part from output[x] on. 'display' is
* entire row buffer, not just the part from output[x] on. 'display' is
* interpreted as:
*
* 0: only overwrite destination pixels that will correspond to the source
@ -3304,7 +3304,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
{
/* Fill a byte with copies of the next pixel: */
unsigned int spixel_rep = spixel;
# ifdef PNG_READ_PACKSWAP_SUPPORTED
if (lsb)
spixel_rep >>= spos;
@ -3396,7 +3396,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
{
/* Fill a byte with copies of the next pixel: */
unsigned int spixel_rep = spixel;
# ifdef PNG_READ_PACKSWAP_SUPPORTED
if (lsb)
spixel_rep >>= spos;
@ -3760,8 +3760,8 @@ png_inflate_IDAT(png_structrp png_ptr, int finish,
debug(png_ptr->zstream_ended);
if (!finish) /* early end */
break;
break;
if (output_size > 0) /* incomplete read */
{
if (finish == 2) /* looking for end; it has been found */
@ -4222,7 +4222,7 @@ png_read_process_IDAT(png_structrp png_ptr, png_bytep transformed_row,
PNG_ROWBYTES(pixel_depth, pixels);
png_alloc_size_t cb;
affirm(bytes_to_read > bytes_read);
cb = png_inflate_IDAT(png_ptr, finish,
pixel_buffer.buffer + bytes_read,
@ -4502,7 +4502,7 @@ png_read_finish_IDAT(png_structrp png_ptr)
*/
{
int ret = inflateEnd(&png_ptr->zstream);
/* In fact we expect this to always succeed, so it is a good idea to
* catch it in pre-release builds:
*/

2
pngstruct.h
View File

@ -325,7 +325,7 @@ typedef void (*png_transform_fn)(/* Function to implement a transform */
* and format as before.
*
* In the write case the transforms are called in the reverse order and
* the input bit depth and format should match the required values.
* the input bit depth and format should match the required values.
*
* It is valid during initialization for the transform function to push
* another transform into the list in either the read or the write case if

2
pngtest.c
View File

@ -2070,4 +2070,4 @@ main(void)
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_7_0beta69 Your_png_h_is_not_version_1_7_0beta69;
typedef png_libpng_version_1_7_0beta70 Your_png_h_is_not_version_1_7_0beta70;

8
pngtrans.c
View File

@ -2228,7 +2228,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
{
unsigned int i = code_size;
png_uint_32 code = 0U;
while (i > 0U)
{
unsigned int next = codes[--i];
@ -2256,7 +2256,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
{
unsigned int i = 0U;
png_uint_32 code = 0U;
while (i < code_size)
{
unsigned int next = codes[i++];
@ -2295,7 +2295,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
static void
png_init_rgb_to_gray_byte_ops(png_transformp *transform,
png_init_rgb_to_gray_byte_ops(png_transformp *transform,
png_transform_controlp tc)
{
/* This just delay initializes the function; all the transform initialization
@ -2532,7 +2532,7 @@ set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc, int alpha)
png_add_transform(png_ptr, sizeof (png_transform_byte_op),
png_init_byte_ops, PNG_TR_CHANNEL_POSTQ));
png_uint_32 args = PNG_BO_FILLER;
if (filler_loc == PNG_FILLER_BEFORE)
args |= PNG_BO_FILLER_FIRST;

8
pngwrite.c
View File

@ -387,7 +387,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
return;
if ((png_ptr->mode &
(PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT+PNG_HAVE_IEND)) !=
(PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT+PNG_HAVE_IEND)) !=
(PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT))
{
/* Out of place png_write_end: */
@ -676,7 +676,7 @@ write_row_buffered(png_structrp png_ptr, png_const_bytep row,
{
png_transform_control tc;
/* The initial values are the memory format, this was worked out in
/* The initial values are the memory format, this was worked out in
* png_init_row_info below.
*/
memset(&tc, 0, sizeof tc);
@ -981,7 +981,7 @@ interlace_row(png_structrp png_ptr, png_const_bytep row)
break;
default: /* Parameter is the pixel size in bytes */
write_row_buffered(png_ptr, row,
write_row_buffered(png_ptr, row,
row_number == PNG_PASS_START_ROW(pass), last_pass_row,
end_of_image, interlace_row_byte, input_depth >> 3);
break;
@ -1038,7 +1038,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
* It's just a warning at present.
*
* The test is that either the row_format produced by the write
* transforms exactly matches that in the original
* transforms exactly matches that in the original
* info_struct::format or that the info_struct::format was a simple
* mapping of the color_type that ended up in the IHDR:
*/

2
pngwutil.c
View File

@ -1971,7 +1971,7 @@ write_filtered_row(png_structrp png_ptr, png_const_bytep filtered_row,
if (filter < PNG_FILTER_VALUE_LAST) /* start of row */
{
png_byte buffer[1];
buffer[0] = filter;
png_compress_IDAT(png_ptr, buffer, 1U/*len*/, Z_NO_FLUSH);
}

2
projects/vstudio/readme.txt
View File

@ -1,7 +1,7 @@
VisualStudio instructions
libpng version 1.7.0beta69 - November 24, 2015
libpng version 1.7.0beta70 - November 24, 2015
Copyright (c) 1998-2010 Glenn Randers-Pehrson

2
projects/vstudio/zlib.props
View File

@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
* libpng version 1.7.0beta69 - November 24, 2015
* libpng version 1.7.0beta70 - November 24, 2015
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*

10
scripts/README.txt
View File

@ -1,9 +1,9 @@
Makefiles for libpng version 1.7.0beta69 - November 24, 2015
Makefiles for libpng version 1.7.0beta70 - November 24, 2015
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng17.so.17.1.7.0beta69)
(gcc, creates libpng17.so.17.1.7.0beta70)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
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.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
creates libpng17.so.17.1.7.0beta69)
creates libpng17.so.17.1.7.0beta70)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng17.so.17.1.7.0beta69)
creates libpng17.so.17.1.7.0beta70)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng17.so.17.1.7.0beta69)
creates libpng17.so.17.1.7.0beta70)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun 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 ""
PNG_DFN "EXPORTS"
PNG_DFN ";Version 1.7.0beta69"
PNG_DFN ";Version 1.7.0beta70"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"

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

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

2
scripts/libpng.pc.in
View File

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

2
scripts/makefile.ne12bsd
View File

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

2
scripts/makefile.netbsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 17
SHLIB_MINOR= 1.7.0beta69
SHLIB_MINOR= 1.7.0beta70
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.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
SHLIB_MAJOR= 17
SHLIB_MINOR= 1.7.0beta69
SHLIB_MINOR= 1.7.0beta70
LIB= png
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.0beta69 STANDARD API DEFINITION */
/* libpng 1.7.0beta70 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.7.0beta69 - November 24, 2015 */
/* Libpng version 1.7.0beta70 - November 24, 2015 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */

2
scripts/symbols.def
View File

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