From d2fe2191dbb2af8a77f31682e04c09bf4ddaa446 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 28 Feb 2012 20:01:15 -0600 Subject: [PATCH] [libpng12] Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). --- ANNOUNCE | 5 +++-- CHANGES | 6 ++++-- pnggccrd.c | 15 ++++++++++++--- pngvcrd.c | 13 ++++++++++++- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c0757cbe..4a73ef41 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.48beta02 - February 27, 2012 +Libpng 1.2.48beta02 - February 29, 2012 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. @@ -55,8 +55,9 @@ version 1.2.48beta01 [Febuary 27, 2012] causing out-of-bounds read in png_set_sCAL() because of failure to copy the string terminators (Franke Busse). -version 1.2.48beta02 [February 27, 2012] +version 1.2.48beta02 [February 29, 2012] Removed the png_free() of unused png_ptr->current_text from pngread.c. + Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index c39cb48c..919056dc 100644 --- a/CHANGES +++ b/CHANGES @@ -2757,10 +2757,12 @@ version 1.2.48beta01 [February 27, 2012] Fixed incorrect type (int copy should be png_size_t copy) in png_inflate(). Fixed off-by-one bug in png_handle_sCAL() when using fixed point arithmetic, causing out-of-bounds read in png_set_sCAL() because of failure to copy - the string terminators (Franke Busse). + the string terminators. This bug was introduced in libpng-1.0.6 (Frank + Busse). -version 1.2.48beta02 [February 27, 2012] +version 1.2.48beta02 [February 29, 2012] Removed the png_free() of unused png_ptr->current_text from pngread.c. + Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pnggccrd.c b/pnggccrd.c index 78b8a7e4..51b90d0b 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -1,6 +1,15 @@ -/* pnggccrd.c was removed from libpng-1.2.20. */ - -/* This code snippet is for use by configure's compilation test. */ +/* pnggccrd.c + * + * Last changed in libpng 1.2.48 [February 29, 2012] + * Copyright (c) 1998-2012 Glenn Randers-Pehrson + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * + * This code snippet is for use by configure's compilation test. The + * remainder of the file was removed from libpng-1.2.20. + */ #if (!defined _MSC_VER) && \ defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \ diff --git a/pngvcrd.c b/pngvcrd.c index ce4233ef..0cbf0a40 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -1 +1,12 @@ -/* pnggvrd.c was removed from libpng-1.2.20. */ +/* pngvcrd.c + * + * Last changed in libpng 1.2.48 [February 29, 2012] + * Copyright (c) 1998-2012 Glenn Randers-Pehrson + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * + * This nearly empty file is for use by configure's compilation test. The + * remainder of the file was removed from libpng-1.2.20. + */