From 36ac0b59b0185030224f4411c96d8ba7c778f428 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 15 Sep 2009 19:12:08 -0500 Subject: [PATCH] [devel] Changed (png_byte)filler to (png_uint_16)filler in png_set_filler(). --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- libpng-1.4.0beta80.txt | 6 +++--- libpng.3 | 16 ++++++++-------- png.h | 10 +++++----- pngtrans.c | 4 ++-- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c91550c93..126ee4c09 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0beta80 - September 3, 2009 +Libpng 1.4.0beta80 - September 16, 2009 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. @@ -544,8 +544,9 @@ version 1.4.0beta79 [September 1, 2009] Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays. Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc(). -version 1.4.0beta80 [September 3, 2009] +version 1.4.0beta80 [September 16, 2009] Removed scripts/libpng.icc + Changed (png_byte)filler to (png_uint_16)filler in png_set_filler(). version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index fef2658c3..45ff7808b 100644 --- a/CHANGES +++ b/CHANGES @@ -2230,8 +2230,9 @@ version 1.4.0beta79 [September 1, 2009] Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays. Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc(). -version 1.4.0beta80 [September 3, 2009] +version 1.4.0beta80 [September 16, 2009] Removed scripts/libpng.icc + Changed (png_byte)filler to (png_uint_16)filler in png_set_filler(). version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/libpng-1.4.0beta80.txt b/libpng-1.4.0beta80.txt index 3cb9aea56..044d89c5e 100644 --- a/libpng-1.4.0beta80.txt +++ b/libpng-1.4.0beta80.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta80 - September 1, 2009 + libpng version 1.4.0beta80 - September 16, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta80 - September 1, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta80 - September 16, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3193,7 +3193,7 @@ source. XIII. Y2K Compliance in libpng -September 1, 2009 +September 16, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 86f587adb..b6e7e39e0 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "September 1, 2009" +.TH LIBPNG 3 "September 16, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta80 .SH SYNOPSIS @@ -809,7 +809,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta80 - September 1, 2009 + libpng version 1.4.0beta80 - September 16, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -820,7 +820,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0beta80 - September 1, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta80 - September 16, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -4002,7 +4002,7 @@ source. .SH XIII. Y2K Compliance in libpng -September 1, 2009 +September 16, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4176,7 +4176,7 @@ the first widely used release: 1.4.0beta9-14 14 10400 14.so.0.0[.0] 1.2.13 13 10213 12.so.0.13[.0] 1.4.0beta15-36 14 10400 14.so.0.0[.0] - 1.4.0beta37-79 14 10400 14.so.14.0[.0] + 1.4.0beta37-80 14 10400 14.so.14.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4232,7 +4232,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta80 - September 1, 2009: +Libpng version 1.4.0beta80 - September 16, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4255,7 +4255,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta80, September 1, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta80, September 16, 2009, 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 @@ -4354,7 +4354,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 1, 2009 +September 16, 2009 .\" end of man page diff --git a/png.h b/png.h index 475d0fe6d..d3773a2a1 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta80 - September 1, 2009 + * libpng version 1.4.0beta80 - September 16, 2009 * Copyright (c) 1998-2009 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.0beta80 - September 1, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta80 - September 16, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -129,7 +129,7 @@ * 1.4.0beta9-14 14 10400 14.so.0.0[.0] * 1.2.13 13 10213 12.so.0.13[.0] * 1.4.0beta15-36 14 10400 14.so.0.0[.0] - * 1.4.0beta37-79 14 10400 14.so.14.0[.0] + * 1.4.0beta37-80 14 10400 14.so.14.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -161,7 +161,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta80, September 1, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta80, September 16, 2009, 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: @@ -337,7 +337,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.0beta80" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta80 - September 1, 2009\n" + " libpng version 1.4.0beta80 - September 16, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngtrans.c b/pngtrans.c index 936a43a89..2ed65c6b9 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.0 [September 1, 2009] + * Last changed in libpng 1.4.0 [September 16, 2009] * Copyright (c) 1998-2009 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.) @@ -117,7 +117,7 @@ png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc) if (png_ptr == NULL) return; png_ptr->transformations |= PNG_FILLER; - png_ptr->filler = (png_byte)filler; + png_ptr->filler = (png_uint_16)filler; if (filler_loc == PNG_FILLER_AFTER) png_ptr->flags |= PNG_FLAG_FILLER_AFTER; else