From 40d90d34a88f168490ce785fbc8564c17cefe879 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 22 Sep 2015 16:04:26 -0500
Subject: [PATCH] [libpng17] Add copyright and license to
 contrib/testpngs/makepngs.sh

---
 contrib/libtests/makepng.c   |  2 +-
 contrib/libtests/pngstest.c  |  4 ----
 contrib/libtests/pngvalid.c  |  4 ++--
 contrib/testpngs/makepngs.sh | 10 +++++++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/contrib/libtests/makepng.c b/contrib/libtests/makepng.c
index 7f54e24a2..d4b850485 100644
--- a/contrib/libtests/makepng.c
+++ b/contrib/libtests/makepng.c
@@ -3,7 +3,7 @@
 /* Copyright: */
 #define COPYRIGHT "\251 2013,2015 John Cunningham Bowler"
 /*
- * Last changed in libpng 1.7.0 [September 20, 2015]
+ * Last changed in libpng 1.7.0 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c
index 44267b4fb..2e4f617c5 100644
--- a/contrib/libtests/pngstest.c
+++ b/contrib/libtests/pngstest.c
@@ -3577,10 +3577,6 @@ main(int argc, char **argv)
       printf(" *\n");
       printf(" * BUILT USING:" PNG_HEADER_VERSION_STRING);
       printf(" *\n");
-      printf(" * This code is released under the libpng license.\n");
-      printf(" * For conditions of distribution and use, see the disclaimer\n");
-      printf(" * and license in png.h\n");
-      printf(" *\n");
       printf(" * THIS IS A MACHINE GENERATED FILE: do not edit it directly!\n");
       printf(" * Instead run:\n");
       printf(" *\n");
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index 5fa363a66..2e463787d 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -1,7 +1,7 @@
 
 /* pngvalid.c - validate libpng by constructing then reading png files.
  *
- * Last changed in libpng 1.6.18 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.24 [(PENDING RELEASE)]
  * Copyright (c) 2014-2015 Glenn Randers-Pehrson
  * Written by John Cunningham Bowler
  *
@@ -3578,7 +3578,7 @@ check_interlace_type(int const interlace_type)
 #define CAN_WRITE_INTERLACE\
    PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED
 
-/* Make a standardized image given a an image colour type, bit depth and
+/* Make a standardized image given an image colour type, bit depth and
  * interlace type.  The standard images have a very restricted range of
  * rows and heights and are used for testing transforms rather than image
  * layout details.  See make_size_images below for a way to make images
diff --git a/contrib/testpngs/makepngs.sh b/contrib/testpngs/makepngs.sh
index 51ff5af1c..818758715 100755
--- a/contrib/testpngs/makepngs.sh
+++ b/contrib/testpngs/makepngs.sh
@@ -2,7 +2,15 @@
 #
 # Make a set of test PNG files, MAKEPNG is the name of the makepng executable
 # built from contrib/libtests/makepng.c
-#
+
+# Copyright (c) 2015 John Cunningham Bowler
+
+# Last changed in libpng 1.7.0 [(PENDING RELEASE)]
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
 # The arguments say whether to build all the files or whether just to build the
 # ones that extend the code-coverage of libpng from the existing test files in
 # contrib/pngsuite.