diff -ru4NwbB libpng-1.4.4/configure.ac libpng-1.4.5beta04/configure.ac --- libpng-1.4.4/configure.ac 2010-09-23 07:18:40.435665492 -0500 +++ libpng-1.4.5beta04/configure.ac 2010-11-08 12:42:03.245892112 -0600 @@ -15,20 +15,20 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) +AC_INIT([libpng], [1.4.5beta04], [png-mng-implement@lists.sourceforge.net]) +AM_INIT_AUTOMAKE +dnl stop configure from automagically running automake +AM_MAINTAINER_MODE + dnl Version number stuff here: PNGLIB_VERSION=1.4.5beta04 PNGLIB_MAJOR=1 -PNGLIB_MINOR=%RELEASE% +PNGLIB_MINOR=4 PNGLIB_RELEASE=%RELEASE% -AC_INIT([libpng], [1.4.5beta04], [png-mng-implement@lists.sourceforge.net]) -AM_INIT_AUTOMAKE -dnl stop configure from automagically running automake -AM_MAINTAINER_MODE - dnl End of version number stuff AC_CONFIG_SRCDIR([pngget.c]) AM_CONFIG_HEADER(config.h) diff -ru4NwbB libpng-1.4.4/png.c libpng-1.4.5beta04/png.c --- libpng-1.4.4/png.c 2010-09-23 07:18:34.010735709 -0500 +++ libpng-1.4.5beta04/png.c 2010-11-08 12:41:56.963158037 -0600 @@ -18,12 +18,8 @@ /* Generate a compiler error if there is an old png.h in the search path. */ typedef version_%_VER_% Your_png_h_is_not_version_%_VER_%; -/* Version information for C files. This had better match the version - * string defined in png.h. - */ - /* 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 * stream we can set num_bytes = 8 so that libpng will not attempt to read * or write any of the magic bytes before it starts on the IHDR. diff -ru4NwbB libpng-1.4.4/png.h libpng-1.4.5beta04/png.h --- libpng-1.4.4/png.h 2010-09-23 07:18:33.979216289 -0500 +++ libpng-1.4.5beta04/png.h 2010-11-08 12:41:56.929651011 -0600 @@ -145,9 +145,11 @@ * 1.4.3beta01-05 14 10403 14.so.14.3[.0] * 1.4.3rc01-03 14 10403 14.so.14.3[.0] * 1.4.3 14 10403 14.so.14.3[.0] * 1.4.4beta01-08 14 10404 14.so.14.4[.0] - * 1.4.4rc01-06 14 10404 14.so.14.4[.0] + * 1.4.4rc01-05 14 10404 14.so.14.4[.0] + * 1.4.4 14 10404 14.so.14.4[.0] + * 1.4.5beta01-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 * used for changes in backward compatibility, as it is intended. The diff -ru4NwbB libpng-1.4.4/pngset.c libpng-1.4.5beta04/pngset.c --- libpng-1.4.4/pngset.c 2010-09-23 07:18:34.091076135 -0500 +++ libpng-1.4.5beta04/pngset.c 2010-11-08 12:41:57.048701998 -0600 @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.1 [February 25, 2010] + * Last changed in libpng 1.4.5 [November 8, 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.) * @@ -689,8 +689,15 @@ if (text_ptr[i].key == NULL) continue; + if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE || + text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST) + { + png_warning(png_ptr, "text compression mode is out of range"); + continue; + } + key_len = png_strlen(text_ptr[i].key); if (text_ptr[i].compression <= 0) {