diff options
-rw-r--r-- | ANNOUNCE | 8 | ||||
-rw-r--r-- | CHANGES | 8 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | libpng-manual.txt | 6 | ||||
-rw-r--r-- | libpng.3 | 14 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 4 | ||||
-rw-r--r-- | png.h | 10 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngpread.c | 20 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 2 |
16 files changed, 47 insertions, 43 deletions
@@ -1,5 +1,5 @@ -Libpng 1.7.0beta68 - November 5, 2015 +Libpng 1.7.0beta68 - November 12, 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. @@ -959,8 +959,10 @@ Version 1.7.0beta67 [November 3, 2015] Removed much of the long list of previous versions from png.h and libpng.3. -Version 1.7.0beta68 [November 5, 2015] - Fixed new bug with CRC error after reading an over-length palette. +Version 1.7.0beta68 [November 12, 2015] + Fixed new bug with CRC error after reading an over-length palette + (bug report by Cosmin Truta). + Cleaned up coding style in png_handle_PLTE(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -5259,9 +5259,11 @@ Version 1.7.0beta67 [November 3, 2015] Removed much of the long list of previous versions from png.h and libpng.3. -Version 1.7.0beta68 [November 5, 2015] - Fixed new bug with CRC error after reading an over-length palette. - +Version 1.7.0beta68 [November 12, 2015] + Fixed new bug with CRC error after reading an over-length palette + (bug report by Cosmin Truta). + Cleaned up coding style in png_handle_PLTE(). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -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.0beta68, November 3, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta68, November 12, 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 @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 3, 2015 +November 12, 2015 @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta68 - November 3, 2015 (shared library 17.0) +README for libpng version 1.7.0beta68 - November 12, 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. diff --git a/libpng-manual.txt b/libpng-manual.txt index 705f3ba32..9f1bcb60b 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.7.0beta68 - November 3, 2015 + libpng version 1.7.0beta68 - November 12, 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.0beta68 - November 3, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta68 - November 12, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5317,8 +5317,6 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -November 3, 2015 - Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 3, 2015" +.TH LIBPNG 3 "November 12, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta68 .SH SYNOPSIS @@ -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.0beta68 - November 3, 2015 + libpng version 1.7.0beta68 - November 12, 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.0beta68 - November 3, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta68 - November 12, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5815,8 +5815,6 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -November 3, 2015 - Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5982,7 +5980,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta68 - November 3, 2015: +Libpng version 1.7.0beta68 - November 12, 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). @@ -6007,7 +6005,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta68, November 3, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta68, November 12, 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 @@ -6106,7 +6104,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 3, 2015 +November 12, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index de80d7a69..9ec8de7f6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 3, 2015" +.TH LIBPNGPF 3 "November 12, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta68 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "November 3, 2015" +.TH PNG 5 "November 12, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -699,13 +699,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta68 - November 3, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta68 - November 12, 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.0beta68 - November 3, 2015\ + return "libpng version 1.7.0beta68 - November 12, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta68, November 3, 2015 + * libpng version 1.7.0beta68, November 12, 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.0beta68, November 3, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta68, November 12, 2015: Glenn * See also "Contributing Authors", below. */ @@ -24,7 +24,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta68, November 3, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta68, November 12, 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 @@ -217,7 +217,7 @@ * Y2K compliance in libpng: * ========================= * - * November 3, 2015 + * November 12, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -287,7 +287,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta68" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta68 - November 3, 2015\n" + " libpng version 1.7.0beta68 - November 12, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta68, November 3, 2015 + * libpng version 1.7.0beta68, November 12, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index abf5d1d01..154f78fab 100644 --- a/pngpread.c +++ b/pngpread.c @@ -335,11 +335,13 @@ png_push_read_unknown(png_structrp png_ptr, png_inforp info_ptr) /* Now check the CRC, before attempting the unknown handling. */ png_calculate_crc(png_ptr, buffer, chunk_length); png_crc_finish(png_ptr, 0); + # ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED - png_handle_unknown(png_ptr, info_ptr, buffer); + png_handle_unknown(png_ptr, info_ptr, buffer); # else /* !READ_UNKNOWN_CHUNKS */ - PNG_UNUSED(info_ptr) + PNG_UNUSED(info_ptr) # endif /* !READ_UNKNOWN_CHUNKS */ + png_ptr->process_mode = png_read_chunk_header; } @@ -360,7 +362,7 @@ png_push_have_row(png_structrp png_ptr, png_bytep row) * one: */ # ifdef PNG_READ_DEINTERLACE_SUPPORTED - if (!png_ptr->do_interlace) + if (!png_ptr->do_interlace) # endif { affirm(PNG_ROW_IN_INTERLACE_PASS(row_number, pass) && row != NULL); @@ -528,13 +530,15 @@ png_push_read_process_IDAT(png_structp png_ptr, png_bytep *bufferp, * is handling the de-interlace; when the app does it it only * see the real rows. */ + # ifdef PNG_READ_DEINTERLACE_SUPPORTED - if (png_ptr->do_interlace) - { - row_buffer = png_ptr->row_buffer; - break; - } + if (png_ptr->do_interlace) + { + row_buffer = png_ptr->row_buffer; + break; + } # endif + continue; case png_row_skip: diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c743f211d..2da3d70ea 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta68 - November 3, 2015 +libpng version 1.7.0beta68 - November 12, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8ebac1fb6..89f7c7dc4 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.7.0beta68 - November 3, 2015 + * libpng version 1.7.0beta68 - November 12, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 85a08600b..5933e667a 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.7.0beta68 - November 3, 2015 +Makefiles for libpng version 1.7.0beta68 - November 12, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 471e62de3..33b6722b0 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.7.0beta68 - November 3, 2015 */ +/* Libpng version 1.7.0beta68 - November 12, 2015 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ |