From 5d809d283bdd1a341978acbbe15366641469bd82 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 31 Dec 2013 20:58:32 -0600 Subject: [PATCH] [libpng12] Updated copyright year in recently-changed files. --- LICENSE | 6 +++--- README | 2 +- png.h | 12 ++++++------ pngrtran.c | 7 +++++-- pngset.c | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 54b0dd98..da829538 100644 --- a/LICENSE +++ b/LICENSE @@ -10,8 +10,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, June 18, 2013, are -Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, January 1, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 18, 2013 +January 1, 2014 diff --git a/README b/README index d01a5c3f..290d051b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.51beta03 - June 18, 2013 (shared library 12.0) +README for libpng version 1.2.51beta03 - January 1, 2014 (shared library 12.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/png.h b/png.h index d103b4eb..72103758 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.51beta03 - November 28, 2013 - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * libpng version 1.2.51beta03 - January 1, 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.) * @@ -10,7 +10,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.51beta03 - November 28, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.2.51beta03 - January 1, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -316,7 +316,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, November 28, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, January 1, 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: @@ -428,7 +428,7 @@ * Y2K compliance in libpng: * ========================= * - * November 28, 2013 + * January 1, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -492,7 +492,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.2.51beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.51beta03 - November 28, 2013\n" + " libpng version 1.2.51beta03 - January 1, 2014\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 diff --git a/pngrtran.c b/pngrtran.c index 7f0ff92e..32119209 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,8 +1,8 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.49 [March 29, 2012] - * Copyright (c) 1998-2012 Glenn Randers-Pehrson + * Last changed in libpng 1.2.51 [January 1, 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.) * @@ -917,7 +917,10 @@ png_init_read_transformations(png_structp png_ptr) for (i=0; inum_trans; i++) { if (png_ptr->trans[i] != 0 && png_ptr->trans[i] != 0xff) + { k=1; /* Partial transparency is present */ + break; + } } if (k == 0) png_ptr->transformations &= ~PNG_GAMMA; diff --git a/pngset.c b/pngset.c index a865e37c..ad1270fa 100644 --- a/pngset.c +++ b/pngset.c @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.51 [June 18, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.2.51 [January 1, 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.) *