From 6916ec5fa9ffd4d81c594aa5fe9785f942899786 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 9 Dec 2010 07:11:09 -0600 Subject: [PATCH] [master] Bump to version 1.4.5rc04 --- ANNOUNCE | 23 ++++++++++------------- CHANGES | 4 ++-- contrib/pngminim/decoder/pngusr.h | 2 +- contrib/pngminim/encoder/pngusr.h | 1 - contrib/pngminim/preader/pngusr.h | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngpriv.h | 2 +- pngread.c | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 4 ++-- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 26 files changed, 52 insertions(+), 56 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 57d61f0f4..752a92716 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.5rc03 - December 3, 2010 +Libpng 1.4.5rc04 - December 9, 2010 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.4.5rc03.tar.xz (LZMA-compressed, recommended) - 1.4.5rc03.tar.gz - 1.4.5rc03.tar.bz2 + 1.4.5rc04.tar.xz (LZMA-compressed, recommended) + 1.4.5rc04.tar.gz + 1.4.5rc04.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp145r03.zip - lp145r03.7z + lp145r04.zip + lp145r04.7z Other information: - 1.4.5rc03-README.txt - 1.4.5rc03-LICENSE.txt + 1.4.5rc04-README.txt + 1.4.5rc04-LICENSE.txt Changes since the last public release (1.4.4): @@ -46,7 +46,7 @@ version 1.4.5beta04 [November 8, 2010] version 1.4.5rc01 [November 19, 2010] No changes. -version 1.4.5beta05 [December 3, 2010] +version 1.4.5beta05 [December 9, 2010] Removed some extraneous parentheses that appeared in pngrutil.c of libpng-1.4.3beta01 Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) @@ -77,12 +77,9 @@ version 1.4.5beta07 [November 25, 2010] version 1.4.5rc02 [December 2, 2010] No changes. -version 1.4.5rc03 [December 3, 2010] +version 1.4.5rc03 [December 9, 2010] Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions. -version 1.4.5rc04 [December 8, 2010] - Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h - Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index f3d99c770..369b04b5c 100644 --- a/CHANGES +++ b/CHANGES @@ -2729,10 +2729,10 @@ version 1.4.5beta07 [November 25, 2010] version 1.4.5rc02 [December 2, 2010] No changes. -version 1.4.5rc03 [December 3, 2010] +version 1.4.5rc03 [December 9, 2010] Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions. -version 1.4.5rc04 [December 8, 2010] +version 1.4.5rc03-cos [December 8, 2010] Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h Send comments/corrections/commendations to glennrp at users.sourceforge.net diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h index 597765a00..7b2c0c54b 100644 --- a/contrib/pngminim/decoder/pngusr.h +++ b/contrib/pngminim/decoder/pngusr.h @@ -38,6 +38,7 @@ #define PNG_NO_READ_gAMA #define PNG_NO_READ_hIST #define PNG_NO_READ_iCCP +#define PNG_NO_READ_oFFs #define PNG_NO_READ_pCAL #define PNG_NO_READ_pHYs #define PNG_NO_READ_sBIT @@ -51,7 +52,6 @@ #define PNG_NO_READ_EMPTY_PLTE #define PNG_NO_READ_OPT_PLTE #define PNG_NO_READ_STRIP_ALPHA -#define PNG_NO_READ_oFFs #define PNG_NO_WRITE_SUPPORTED diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h index b4024aa0b..e4029b5c8 100644 --- a/contrib/pngminim/encoder/pngusr.h +++ b/contrib/pngminim/encoder/pngusr.h @@ -23,7 +23,6 @@ #define PNG_NO_WRITE_BACKGROUND #define PNG_NO_WRITE_BGR -#define PNG_NO_WRITE_GAMMA #define PNG_NO_WRITE_QUANTIZE #define PNG_NO_WRITE_INVERT #define PNG_NO_WRITE_SHIFT diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h index bfaa723c9..bacb649b6 100644 --- a/contrib/pngminim/preader/pngusr.h +++ b/contrib/pngminim/preader/pngusr.h @@ -34,6 +34,7 @@ #define PNG_NO_READ_cHRM #define PNG_NO_READ_hIST #define PNG_NO_READ_iCCP +#define PNG_NO_READ_oFFs #define PNG_NO_READ_pCAL #define PNG_NO_READ_pHYs #define PNG_NO_READ_sBIT @@ -46,7 +47,6 @@ #define PNG_NO_READ_EMPTY_PLTE #define PNG_NO_READ_OPT_PLTE #define PNG_NO_READ_STRIP_ALPHA -#define PNG_NO_READ_oFFs #define PNG_NO_WRITE_SUPPORTED diff --git a/png.c b/png.c index dac9c0171..94ff53c94 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_5rc03 Your_png_h_is_not_version_1_4_5rc03; +typedef version_1_4_5rc04 Your_png_h_is_not_version_1_4_5rc04; /* 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 @@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.5rc03 - December 3, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.5rc04 - December 9, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.5rc03 - December 3, 2010\ + return ((png_charp) "libpng version 1.4.5rc04 - December 9, 2010\ Copyright (c) 1998-2010 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 6a55c93c2..dc9c1393f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.5rc03 - December 3, 2010 + * libpng version 1.4.5rc04 - December 9, 2010 * Copyright (c) 1998-2010 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.4.5rc03 - December 3, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.5rc04 - December 9, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -151,7 +151,7 @@ * 1.4.5beta01-04 14 10405 14.so.14.5[.0] * 1.4.5rc01 14 10405 14.so.14.5[.0] * 1.4.5beta05-07 14 10405 14.so.14.5[.0] - * 1.4.5rc02 14 10405 14.so.14.5[.0] + * 1.4.5rc02-04 14 10405 14.so.14.5[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -183,7 +183,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.5rc03, December 3, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.5rc04, December 9, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -295,13 +295,13 @@ * Y2K compliance in libpng: * ========================= * - * December 3, 2010 + * December 9, 2010 * * 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.4.5rc03 are Y2K compliant. It is my belief that earlier + * upward through 1.4.5rc04 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -357,9 +357,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.5rc03" +#define PNG_LIBPNG_VER_STRING "1.4.5rc04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.5rc03 - December 3, 2010\n" + " libpng version 1.4.5rc04 - December 9, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -372,7 +372,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1481,7 +1481,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_4_5rc03; +typedef png_structp version_1_4_5rc04; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 66ef83d8c..36cc97aeb 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.5rc03 - December 3, 2010 + * libpng version 1.4.5rc04 - December 9, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 6d18128e6..a1ae7682d 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.5rc03 - December 3, 2010 + * libpng version 1.4.5rc04 - December 9, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index 36ce7209b..480644807 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) diff --git a/pngrio.c b/pngrio.c index 6d8253398..cab7114a9 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) diff --git a/pngrtran.c b/pngrtran.c index 67edd8767..449751431 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) diff --git a/pngrutil.c b/pngrutil.c index a0008932f..5429887a5 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) diff --git a/pngset.c b/pngset.c index e3faac4ff..76f173e4e 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) diff --git a/pngtest.c b/pngtest.c index 016982835..c81f59026 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.5 [December 3, 2010] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) @@ -1687,4 +1687,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_5rc03 your_png_h_is_not_version_1_4_5rc03; +typedef version_1_4_5rc04 your_png_h_is_not_version_1_4_5rc04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ea835f4e3..678e2bebe 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.5rc03 - December 3, 2010 +libpng version 1.4.5rc04 - December 9, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 55e72e696..4f459db40 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@