diff --git a/CMakeLists.txt b/CMakeLists.txt index f1965e8c0..a0482e9ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.11beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.11beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 1036aed97..0abd55492 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11beta03, March 25, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, April 6, 2014, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 25, 2014 +April 6, 2014 diff --git a/README b/README index c81788390..bfb3bb247 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.11beta03 - March 25, 2014 (shared library 16.0) +README for libpng version 1.6.11beta02 - April 6, 2014 (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 bcf9d948c..ae74bf3ee 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.11beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.11beta02],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,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.11beta03 +PNGLIB_VERSION=1.6.11beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=11 diff --git a/libpng-manual.txt b/libpng-manual.txt index 4e87ef02e..d97b02020 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.11beta03 - March 25, 2014 + libpng version 1.6.11beta02 - April 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.11beta03 - March 25, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta02 - April 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4756,8 +4756,6 @@ does not account for any palette index used by ancillary chunks such as the bKGD chunk; you must check those separately to determine the maximum palette index actually used. -A. Changes that affect users of libpng - There are no substantial API changes between the non-deprecated parts of the 1.4.5 API and the 1.5.0 API; however, the ability to directly access members of the main libpng control structures, png_struct and png_info, @@ -5129,7 +5127,8 @@ mailing list, or directly to glennrp. XV. Coding style -Our coding style is similar to the "Allman" style, with curly +Our coding style is similar to the "Allman" style +(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -5262,13 +5261,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 25, 2014 +April 6, 2014 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.11beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.11beta02 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 5913dbd5d..d24414ddf 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 25, 2014" +.TH LIBPNG 3 "April 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,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.11beta03 - March 25, 2014 + libpng version 1.6.11beta02 - April 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.11beta03 - March 25, 2014 + libpng versions 0.97, January 1998, through 1.6.11beta02 - April 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5260,8 +5260,6 @@ does not account for any palette index used by ancillary chunks such as the bKGD chunk; you must check those separately to determine the maximum palette index actually used. -A. Changes that affect users of libpng - There are no substantial API changes between the non-deprecated parts of the 1.4.5 API and the 1.5.0 API; however, the ability to directly access members of the main libpng control structures, png_struct and png_info, @@ -5633,7 +5631,8 @@ mailing list, or directly to glennrp. .SH XV. Coding style -Our coding style is similar to the "Allman" style, with curly +Our coding style is similar to the "Allman" style +(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -5766,13 +5765,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 25, 2014 +April 6, 2014 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.11beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.11beta02 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 @@ -6006,7 +6005,7 @@ the first widely used release: 1.6.10beta01-03 16 10610 16.so.16.10[.0] 1.6.10rc01-03 16 10610 16.so.16.10[.0] 1.6.10 16 10610 16.so.16.10[.0] - 1.6.11beta01-03 16 10611 16.so.16.11[.0] + 1.6.11beta01-02 16 10611 16.so.16.11[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6063,7 +6062,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.11beta03 - March 25, 2014: +Libpng version 1.6.11beta02 - April 6, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6086,7 +6085,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.11beta03, March 25, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, April 6, 2014, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6185,7 +6184,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 25, 2014 +April 6, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 45b3a7c5d..f8d404f79 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 25, 2014" +.TH LIBPNGPF 3 "April 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.11beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 53b38f02c..3ab560e2a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 25, 2014" +.TH PNG 5 "April 6, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 89a7771c6..6440b852e 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_11beta03 Your_png_h_is_not_version_1_6_11beta03; +typedef png_libpng_version_1_6_11beta02 Your_png_h_is_not_version_1_6_11beta02; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.11beta03 - March 25, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.11beta02 - April 6, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.11beta03 - March 25, 2014\ + return "libpng version 1.6.11beta02 - April 6, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -4093,7 +4093,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) } #endif /* READ_GAMMA */ -/* HARDWARE OPTION SUPPORT */ +/* HARDWARE OR SOFTWARE OPTION SUPPORT */ #ifdef PNG_SET_OPTION_SUPPORTED int PNGAPI png_set_option(png_structrp png_ptr, int option, int onoff) diff --git a/png.h b/png.h index a3d1b3eca..00162a79a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.11beta03 - March 25, 2014 + * libpng version 1.6.11beta02 - April 6, 2014 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.11beta03 - March 25, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.11beta02 - April 6, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -195,7 +195,7 @@ * 1.6.10beta01-03 16 10610 16.so.16.10[.0] * 1.6.10rc01-03 16 10610 16.so.16.10[.0] * 1.6.10 16 10610 16.so.16.10[.0] - * 1.6.11beta01-03 16 10611 16.so.16.11[.0] + * 1.6.11beta01-02 16 10611 16.so.16.11[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -227,7 +227,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta03, March 25, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.11beta02, April 6, 2014, are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -339,13 +339,13 @@ * Y2K compliance in libpng: * ========================= * - * March 25, 2014 + * April 6, 2014 * * 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.11beta03 are Y2K compliant. It is my belief that + * upward through 1.6.11beta02 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 @@ -407,9 +407,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.11beta03" +#define PNG_LIBPNG_VER_STRING "1.6.11beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.11beta03 - March 25, 2014\n" + " libpng version 1.6.11beta02 - April 6, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -423,7 +423,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -553,7 +553,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_11beta03; +typedef char* png_libpng_version_1_6_11beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -3241,7 +3241,7 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option, #endif /******************************************************************************* - * END OF HARDWARE OPTIONS + * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ /* Maintainer: Put new public prototypes here ^, in libpng.3, and project diff --git a/pngconf.h b/pngconf.h index f60648cfb..cc94d6bd1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.11beta03 - March 25, 2014 + * libpng version 1.6.11beta02 - April 6, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index b01a0b14e..1bcc285bd 100644 --- a/pngpread.c +++ b/pngpread.c @@ -979,15 +979,15 @@ png_push_process_row(png_structrp png_ptr) #ifdef PNG_READ_INTERLACING_SUPPORTED - /* Blow up interlaced rows to full size */ + /* Expand interlaced rows to full size */ if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) { if (png_ptr->pass < 6) png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations); - switch (png_ptr->pass) - { + switch (png_ptr->pass) + { case 0: { int i; diff --git a/pngread.c b/pngread.c index 32043cacc..e26f001af 100644 --- a/pngread.c +++ b/pngread.c @@ -572,7 +572,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) png_error(png_ptr, "internal sequential row size calculation error"); #ifdef PNG_READ_INTERLACING_SUPPORTED - /* Blow up interlaced rows to full size */ + /* Expand interlaced rows to full size */ if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) { diff --git a/pngtest.c b/pngtest.c index 74d052f83..3078a4c43 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,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_11beta03 Your_png_h_is_not_version_1_6_11beta03; +typedef png_libpng_version_1_6_11beta02 Your_png_h_is_not_version_1_6_11beta02; diff --git a/pngtrans.c b/pngtrans.c index 22499e49c..98f75d583 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -327,9 +327,13 @@ png_do_swap(png_row_infop row_info, png_bytep row) for (i = 0; i < istop; i++, rp += 2) { +#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED + *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp); +#else png_byte t = *rp; *rp = *(rp + 1); *(rp + 1) = t; +#endif } } } diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 24e916ce9..b4b3eca1b 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.11beta03 - March 25, 2014 +libpng version 1.6.11beta02 - April 6, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 791a9466e..3e8b0123e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@