From eb2af04bd31780a2cf1ca6d813793645e5fabd3e Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 28 Dec 2013 13:11:47 -0600 Subject: [PATCH] [libpng16] Merged pngrio.c, pngtrans.c, and pngwio.c with libpng-1.6.9 --- ANNOUNCE | 1 + CHANGES | 1 + pngrio.c | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index dc80abfd9..6c67636a8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -473,6 +473,7 @@ Version 1.7.0beta26 [December 28, 2013] Merged with 1.5 and 1.6 changes to create a single pngvalid.c Added dSIG to chunk list in png.h Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). + Merged pngrio.c, pngtrans.c, and pngwio.c with libpng-1.6.9 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 318c6a924..2fd91bb36 100644 --- a/CHANGES +++ b/CHANGES @@ -4762,6 +4762,7 @@ Version 1.7.0beta26 [December 28, 2013] Merged with 1.5 and 1.6 changes to create a single pngvalid.c Added dSIG to chunk list in png.h Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). + Merged pngrio.c, pngtrans.c, and pngwio.c with libpng-1.6.9 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrio.c b/pngrio.c index 9ad74ea3d..57379e1fb 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.6.9 [(PENDING RELEASE)] * Copyright (c) 1998-2013 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.) diff --git a/pngtrans.c b/pngtrans.c index 51b604cee..108beeed0 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.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.6.9 [(PENDING RELEASE)] * Copyright (c) 1998-2013 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.) diff --git a/pngwio.c b/pngwio.c index 38dd1e7fe..430937348 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.6.9 [(PENDING RELEASE)] * Copyright (c) 1998-2013 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.)