diff --git a/headers/libs/png/png.h b/headers/libs/png/png.h index 1926426d17..80e6645b5c 100644 --- a/headers/libs/png/png.h +++ b/headers/libs/png/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.30 - August 15, 2008 + * libpng version 1.2.32 - September 18, 2008 * Copyright (c) 1998-2008 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.) @@ -8,7 +8,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.2.30 - August 15, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.32 - September 18, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -198,10 +198,15 @@ * 1.2.30rc01-08 13 10230 12.so.0.30[.0] * 1.0.38 10 10038 10.so.0.38[.0] * 1.2.30 13 10230 12.so.0.30[.0] - * 1.0.38rc01-03 10 10039 10.so.0.39[.0] + * 1.0.39rc01-03 10 10039 10.so.0.39[.0] * 1.2.31rc01-03 13 10231 12.so.0.31[.0] - * 1.0.38 10 10039 10.so.0.39[.0] + * 1.0.39 10 10039 10.so.0.39[.0] * 1.2.31 13 10231 12.so.0.31[.0] + * 1.2.32beta01-02 13 10232 12.so.0.32[.0] + * 1.0.40rc01 10 10040 10.so.0.40[.0] + * 1.2.32rc01 13 10232 12.so.0.32[.0] + * 1.0.40 10 10040 10.so.0.40[.0] + * 1.2.32 13 10232 12.so.0.32[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -231,7 +236,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.30, August 15, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.32, September 18, 2008, are * Copyright (c) 2004, 2006-2008 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: @@ -343,13 +348,13 @@ * Y2K compliance in libpng: * ========================= * - * August 15, 2008 + * September 18, 2008 * * 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.2.30 are Y2K compliant. It is my belief that earlier + * upward through 1.2.32 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 @@ -405,9 +410,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.30" +#define PNG_LIBPNG_VER_STRING "1.2.32" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.30 - August 15, 2008\n" + " libpng version 1.2.32 - September 18, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -415,7 +420,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 2 -#define PNG_LIBPNG_VER_RELEASE 30 +#define PNG_LIBPNG_VER_RELEASE 32 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ @@ -443,7 +448,7 @@ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10230 /* 1.2.30 */ +#define PNG_LIBPNG_VER 10232 /* 1.2.32 */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -1464,7 +1469,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_2_30; +typedef png_structp version_1_2_32; typedef png_struct FAR * FAR * png_structpp; diff --git a/headers/libs/png/pngconf.h b/headers/libs/png/pngconf.h index 156e88942b..231777be36 100644 --- a/headers/libs/png/pngconf.h +++ b/headers/libs/png/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.30 - August 15, 2008 + * libpng version 1.2.32 - September 18, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/src/libs/png/png.c b/src/libs/png/png.c index da50f0b804..fa30bf728c 100644 --- a/src/libs/png/png.c +++ b/src/libs/png/png.c @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_30 Your_png_h_is_not_version_1_2_30; +typedef version_1_2_32 Your_png_h_is_not_version_1_2_32; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -694,7 +694,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.30 - August 15, 2008\n\ + return ((png_charp) "\n libpng version 1.2.32 - September 18, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); diff --git a/src/libs/png/pngpread.c b/src/libs/png/pngpread.c index f86b01b0f6..b06fbadabd 100644 --- a/src/libs/png/pngpread.c +++ b/src/libs/png/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.30 [August 15, 2008] + * Last changed in libpng 1.2.32 [September 18, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1279,7 +1279,7 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr) tmp = text; text = (png_charp)png_malloc(png_ptr, text_size + (png_uint_32)(png_ptr->zbuf_size - - png_ptr->zstream.avail_out)); + - png_ptr->zstream.avail_out + 1)); png_memcpy(text, tmp, text_size); png_free(png_ptr, tmp); png_memcpy(text + text_size, png_ptr->zbuf, diff --git a/src/libs/png/pngrutil.c b/src/libs/png/pngrutil.c index eda4fc453d..e8b0b792a3 100644 --- a/src/libs/png/pngrutil.c +++ b/src/libs/png/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.31 [August 21, 2008] + * Last changed in libpng 1.2.31 [August 19, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/src/libs/png/pngwrite.c b/src/libs/png/pngwrite.c index 233a845191..26ea2db160 100644 --- a/src/libs/png/pngwrite.c +++ b/src/libs/png/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.31 [August 21, 2008] + * Last changed in libpng 1.2.31 [August 19, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)