From dd8aa3e939b349db46db3a24969987b508d5bc3c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 31 Dec 2016 13:03:23 -0600 Subject: [PATCH 1/5] [libpng16] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna) --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- CMakeLists.txt | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 1aa841436..d82dd7127 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.28beta01 - December 30, 2016 +Libpng 1.6.28beta01 - December 31, 2016 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. @@ -25,7 +25,8 @@ Other information: Changes since the last public release (1.6.27): -Version 1.6.28beta01 [December 30, 2016] +Version 1.6.28beta01 [December 31, 2016] + Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b114af4d0..c9cdbccd6 100644 --- a/CHANGES +++ b/CHANGES @@ -5774,7 +5774,8 @@ Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -Version 1.6.28beta01 [December 30, 2016] +Version 1.6.28beta01 [December 31, 2016] + Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index b49ed36ad..e5d429e9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,8 @@ set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names") set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings") # set definitions and sources for arm -if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm" OR + ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64") set(PNG_ARM_NEON_POSSIBLE_VALUES check on off) set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations: check: (default) use internal checking code; From 14e885a54c4cab19011ec10f466fc992f3e03f4e Mon Sep 17 00:00:00 2001 From: Sam Serrels Date: Mon, 2 Jan 2017 01:36:47 +0000 Subject: [PATCH 2/5] Added option to Cmake build allowing a custom location of Zlib to be specified. This is useful in a scenario where libpng is being built as a subproject alongside zlib by another project.. --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d429e9c..5bd8d2803 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,8 +41,15 @@ set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) # needed packages -find_package(ZLIB REQUIRED) -include_directories(${ZLIB_INCLUDE_DIR}) + +#Allow users to specify location of Zlib, +# Useful if zlib is being built alongside this as a sub-project +option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF) + +IF(NOT PNG_BUILD_ZLIB) + find_package(ZLIB REQUIRED) + include_directories(${ZLIB_INCLUDE_DIR}) +ENDIF(NOT PNG_BUILD_ZLIB) if(NOT WIN32) find_library(M_LIBRARY From f981826204e6eaaa453a88b7ccada770ab26d071 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 2 Jan 2017 09:40:23 -0600 Subject: [PATCH 3/5] [libpng16] Update CHANGES and ANNOUNCE with recent CMakeLists.txt update. --- ANNOUNCE | 7 +++++-- CHANGES | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d82dd7127..0d61d831d 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.28beta01 - December 31, 2016 +Libpng 1.6.28beta01 - January 2, 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. @@ -25,8 +25,11 @@ Other information: Changes since the last public release (1.6.27): -Version 1.6.28beta01 [December 31, 2016] +Version 1.6.28beta01 [January 2, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). + Added option to Cmake build allowing a custom location of zlib to be + specified in a scenario where libpng is being built as a subproject + alongside zlib by another project (Sam Serrels). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c9cdbccd6..b02c53302 100644 --- a/CHANGES +++ b/CHANGES @@ -5774,8 +5774,11 @@ Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -Version 1.6.28beta01 [December 31, 2016] +Version 1.6.28beta01 [January 2, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). + Added option to Cmake build allowing a custom location of zlib to be + specified in a scenario where libpng is being built as a subproject + alongside zlib by another project (Sam Serrels). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit From f8bdbd4d8f9da0ed6003ac786db847e9326dd986 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 2 Jan 2017 19:03:36 -0600 Subject: [PATCH 4/5] [libpng16] Changed png_ptr->options from a png_byte to png_uint_32, to accomodate up to 16 options. --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- png.c | 14 +++++++------- png.h | 10 +++++----- pngstruct.h | 6 +++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 0d61d831d..f3f7f9250 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.28beta01 - January 2, 2017 +Libpng 1.6.28beta01 - January 3, 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. @@ -25,11 +25,13 @@ Other information: Changes since the last public release (1.6.27): -Version 1.6.28beta01 [January 2, 2017] +Version 1.6.28beta01 [January 3, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Added option to Cmake build allowing a custom location of zlib to be specified in a scenario where libpng is being built as a subproject alongside zlib by another project (Sam Serrels). + Changed png_ptr->options from a png_byte to png_uint_32, to accomodate + up to 16 options. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b02c53302..d5b1913a7 100644 --- a/CHANGES +++ b/CHANGES @@ -5774,11 +5774,13 @@ Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -Version 1.6.28beta01 [January 2, 2017] +Version 1.6.28beta01 [January 3, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Added option to Cmake build allowing a custom location of zlib to be specified in a scenario where libpng is being built as a subproject alongside zlib by another project (Sam Serrels). + Changed png_ptr->options from a png_byte to png_uint_32, to accomodate + up to 16 options. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.c b/png.c index f67e23b8f..c8c4f9490 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.6.27 [December 29, 2016] + * Last changed in libpng 1.6.28 [(PENDING RELEASE)] * Copyright (c) 1998-2002,2004,2006-2017 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.) @@ -776,14 +776,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.28beta01 - December 30, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.28beta01 - January 3, 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.28beta01 - December 30, 2016\ + return "libpng version 1.6.28beta01 - January 3, 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."; @@ -4260,11 +4260,11 @@ png_set_option(png_structrp png_ptr, int option, int onoff) if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT && (option & 1) == 0) { - int mask = 3 << option; - int setting = (2 + (onoff != 0)) << option; - int current = png_ptr->options; + png_uint_32 mask = 3 << option; + png_uint_32 setting = (2 + (onoff != 0)) << option; + png_uint_32 current = png_ptr->options; - png_ptr->options = (png_byte)(((current & ~mask) | setting) & 0xff); + png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff); return (current & mask) >> option; } diff --git a/png.h b/png.h index adefeab81..037c89f51 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.28beta01, December 30, 2016 + * libpng version 1.6.28beta01, January 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 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.6.28beta01, December 30, 2016: + * libpng versions 0.97, January 1998, through 1.6.28beta01, January 3, 2017: * 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.6.28beta01, December 30, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.28beta01, January 3, 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 @@ -239,7 +239,7 @@ * Y2K compliance in libpng: * ========================= * - * December 30, 2016 + * January 3, 2017 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -308,7 +308,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.28beta01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28beta01 - December 30, 2016\n" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28beta01 - January 3, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngstruct.h b/pngstruct.h index 55516eaaa..22f97bc0f 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -1,8 +1,8 @@ /* pngstruct.h - header file for PNG reference library * - * Last changed in libpng 1.6.24 [August 4, 2016] - * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson + * Last changed in libpng 1.6.28 [(PENDING RELEASE)] + * Copyright (c) 1998-2002,2004,2006-2017 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.) * @@ -353,7 +353,7 @@ struct png_struct_def /* Options */ #ifdef PNG_SET_OPTION_SUPPORTED - png_byte options; /* On/off state (up to 4 options) */ + png_uint_32 options; /* On/off state (up to 16 options) */ #endif #if PNG_LIBPNG_VER < 10700 From 24dfd3f2d733dc5bf52c5a17ac6136f638e51c49 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 3 Jan 2017 12:40:33 -0600 Subject: [PATCH 5/5] [libpng16] Imported from libpng-1.6.28rc01.tar --- ANNOUNCE | 16 ++++++++-------- CHANGES | 2 +- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 6 +++--- libpng.3 | 16 ++++++++-------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 16 ++++++++-------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/README.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++++----- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f3f7f9250..26d09fff3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.28beta01 - January 3, 2017 +Libpng 1.6.28rc01 - January 3, 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.28beta01.tar.xz (LZMA-compressed, recommended) - 1.6.28beta01.tar.gz + 1.6.28rc01.tar.xz (LZMA-compressed, recommended) + 1.6.28rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1628b01.7z (LZMA-compressed, recommended) - lp1628b01.zip + lp1628r01.7z (LZMA-compressed, recommended) + lp1628r01.zip Other information: - 1.6.28beta01-README.txt - 1.6.28beta01-LICENSE.txt - libpng-1.6.28beta01-*.asc (armored detached GPG signatures) + 1.6.28rc01-README.txt + 1.6.28rc01-LICENSE.txt + libpng-1.6.28rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.27): diff --git a/CHANGES b/CHANGES index d5b1913a7..3ff1ccc61 100644 --- a/CHANGES +++ b/CHANGES @@ -5774,7 +5774,7 @@ Version 1.6.27 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -Version 1.6.28beta01 [January 3, 2017] +Version 1.6.28rc01 [January 3, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). Added option to Cmake build allowing a custom location of zlib to be specified in a scenario where libpng is being built as a subproject diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bd8d2803..de2f29f1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -735,7 +735,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.28beta01 +# VERSION 16.${PNGLIB_RELEASE}.1.6.28rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 3a1ae0983..5b4187107 100644 --- a/LICENSE +++ b/LICENSE @@ -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.28beta01, December 30, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.28rc01, January 3, 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 @@ -128,4 +128,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 30, 2016 +January 3, 2017 diff --git a/README b/README index 6ee6150ce..9bc8d8d6a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.28beta01 - December 30, 2016 (shared library 16.0) +README for libpng version 1.6.28rc01 - January 3, 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. diff --git a/configure.ac b/configure.ac index 0791c3251..df18c4182 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.28beta01],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.28rc01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,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.6.28beta01 +PNGLIB_VERSION=1.6.28rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=28 diff --git a/libpng-manual.txt b/libpng-manual.txt index fe6ec2fcd..c10e81f82 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.6.28beta01 - December 30, 2016 + libpng version 1.6.28rc01 - January 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.6.28beta01 - December 30, 2016 + libpng versions 0.97, January 1998, through 1.6.28rc01 - January 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5355,7 +5355,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.6.28beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.28rc01 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 diff --git a/libpng.3 b/libpng.3 index a21bed45d..6c247eda4 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 30, 2016" +.TH LIBPNG 3 "January 3, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28rc01 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.28beta01 - December 30, 2016 + libpng version 1.6.28rc01 - January 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.28beta01 - December 30, 2016 + libpng versions 0.97, January 1998, through 1.6.28rc01 - January 3, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5865,7 +5865,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.6.28beta01 are Y2K compliant. It is my belief that earlier +upward through 1.6.28rc01 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 @@ -6023,7 +6023,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.28beta01 - December 30, 2016: +Libpng version 1.6.28rc01 - January 3, 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). @@ -6048,7 +6048,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.28beta01, December 30, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.28rc01, January 3, 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 @@ -6174,7 +6174,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 30, 2016 +January 3, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index dbdeb1700..56e03f580 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 30, 2016" +.TH LIBPNGPF 3 "January 3, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.28rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 6e786e870..cc9719eec 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 30, 2016" +.TH PNG 5 "January 3, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c8c4f9490..5295e635a 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_28beta01 Your_png_h_is_not_version_1_6_28beta01; +typedef png_libpng_version_1_6_28rc01 Your_png_h_is_not_version_1_6_28rc01; /* 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 @@ -776,14 +776,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.28beta01 - January 3, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.6.28rc01 - January 3, 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.28beta01 - January 3, 2017\ + return "libpng version 1.6.28rc01 - January 3, 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."; diff --git a/png.h b/png.h index 037c89f51..5f4a19601 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.28beta01, January 3, 2017 + * libpng version 1.6.28rc01, January 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2017 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.6.28beta01, January 3, 2017: + * libpng versions 0.97, January 1998, through 1.6.28rc01, January 3, 2017: * 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.6.28beta01, January 3, 2017 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.28rc01, January 3, 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 @@ -245,7 +245,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.28beta01 are Y2K compliant. It is my belief that + * upward through 1.6.28rc01 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 @@ -307,8 +307,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.28beta01" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28beta01 - January 3, 2017\n" +#define PNG_LIBPNG_VER_STRING "1.6.28rc01" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28rc01 - January 3, 2017\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -339,7 +339,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -457,7 +457,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_6_28beta01; +typedef char* png_libpng_version_1_6_28rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 1aa8ca554..61324d3da 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.28beta01, December 30, 2016 + * libpng version 1.6.28rc01, January 3, 2017 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 4736ae5a4..139d81f59 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2088,4 +2088,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_28beta01 Your_png_h_is_not_version_1_6_28beta01; +typedef png_libpng_version_1_6_28rc01 Your_png_h_is_not_version_1_6_28rc01; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 1f93c0301..b48056fe8 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.28beta01 - December 30, 2016 +libpng version 1.6.28rc01 - January 3, 2017 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 05a87ce38..dd79eef19 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@