From 54a066a8a9a40c91065a7941e877a0ba4ad20097 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 19 Sep 1999 06:04:18 -0500
Subject: [PATCH] Imported from libpng-1.0.4.tar

---
 ANNOUNCE   |  5 +++--
 CHANGES    |  5 +++--
 INSTALL    |  2 +-
 LICENSE    | 41 +++++++++++++++++++++++++++++++++++++++++
 README     |  2 +-
 Y2KINFO    |  2 +-
 libpng.3   | 15 +++++++++------
 libpng.txt |  2 +-
 libpngpf.3 |  4 ++--
 png.5      |  2 +-
 png.c      |  4 ++--
 png.h      | 25 +++++++++++++++----------
 pngasmrd.h |  2 +-
 pngconf.h  |  2 +-
 pngerror.c |  2 +-
 pngget.c   |  2 +-
 pngmem.c   |  2 +-
 pngpread.c |  2 +-
 pngread.c  |  2 +-
 pngrio.c   |  2 +-
 pngrtran.c |  2 +-
 pngrutil.c |  2 +-
 pngset.c   |  2 +-
 pngtest.c  |  2 +-
 pngtrans.c |  2 +-
 pngvcrd.c  |  2 +-
 pngwio.c   |  2 +-
 pngwrite.c |  2 +-
 pngwtran.c |  2 +-
 pngwutil.c |  2 +-
 30 files changed, 98 insertions(+), 47 deletions(-)
 create mode 100644 LICENSE

diff --git a/ANNOUNCE b/ANNOUNCE
index 9438c33b..d9886917 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.0.4 - September 18, 1999
+Libpng 1.0.4 - September 19, 1999
 
 This is a public release of libpng, intended for use in production codes.
 
@@ -49,7 +49,8 @@ Changes since the last public release (1.0.3):
   Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
   Made several minor corrections to pngtest.c
   Changed "hptr += 16L" to "hptr = hptr + 16L" in pngmem.c for Turbo 3.0
-  Renamed the makefiles with longer but more user friendly extensions
+  Renamed the makefiles with longer but more user friendly extensions.
+  Copied the PNG copyright and license to a separate LICENSE file.
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index 1e7e9ce6..7135912e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -436,8 +436,9 @@ version 1.0.3d [September 4, 1999]
   Fixed type casting of igamma in pngrutil.c
   Added new png_expand functions to scripts/pngdef.pas and pngos2.def
   Added a demo read_user_transform_fn that examines the row filters in pngtest.c
-version 1.0.4 [September 18, 1999]
+version 1.0.4 [September 19, 1999]
   Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
   Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h
   Made several minor corrections to pngtest.c
-  Renamed the makefiles with longer but more user friendly extensions
+  Renamed the makefiles with longer but more user friendly extensions.
+  Copied the PNG copyright and license to a separate LICENSE file.
diff --git a/INSTALL b/INSTALL
index ba568445..1cd8b632 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.0.4 - September 18, 1999
+Installing libpng version 1.0.4 - September 19, 1999
 
 Before installing libpng, you must first install zlib.  zlib
 can usually be found wherever you got libpng.  zlib can be
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..92dd0eae
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,41 @@
+COPYRIGHT NOTICE:
+
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+(libpng versions 0.5, May 1995, through 0.89c, May 1996)
+Copyright (c) 1996, 1997 Andreas Dilger
+(libpng versions 0.90, December 1996, through 0.96, May 1997)
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+(libpng versions 0.97, January 1998, through 1.0.4, September 19, 1999)
+
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be
+    misrepresented.
+
+ 2. Altered versions must be plainly marked as such
+    and must not be misrepresented as being the
+    original source.
+
+ 3. This Copyright notice may not be removed or
+    altered from any source or altered source
+    distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+Glenn Randers-Pehrson
+randeg at alum.rpi.edu
+September 19, 1999
diff --git a/README b/README
index 750468e5..ae4f7285 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.0.4 - September 18, 1999 (shared library 2.1)
+README for libpng 1.0.4 - September 19, 1999 (shared library 2.1)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
diff --git a/Y2KINFO b/Y2KINFO
index 8219b607..bdd22447 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,7 +1,7 @@
    Y2K compliance in libpng:
    =========================
       
-      January 13, 1999
+      September 19, 1999
       
       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 acbaee2d..48f3eb53 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 18, 1999"
+.TH LIBPNG 3 "September 19, 1999"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 18, 1999
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 19, 1999
 .SH SYNOPSIS
 \fI\fB
 
@@ -617,7 +617,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.0.4 - September 18, 1999
+ libpng version 1.0.4 - September 19, 1999
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999 Glenn Randers-Pehrson
@@ -2815,7 +2815,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
   
-Libpng version 1.0.4 - September 18, 1999:
+Libpng version 1.0.4 - September 19, 1999:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
 
@@ -2825,9 +2825,12 @@ Supported by the PNG development group
 
 .SH COPYRIGHT NOTICE:
 
-Copyright (c) 1998, 1999 Glenn Randers-Pehrson
-Copyright (c) 1996, 1997 Andreas Dilger
 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+(libpng versions 0.5, May 1995, through 0.89c, May 1996)
+Copyright (c) 1996, 1997 Andreas Dilger
+(libpng versions 0.90, December 1996, through 0.96, May 1997)
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+(libpng versions 0.97, January 1998, through 1.0.4, September 19, 1999)
 
 The PNG Reference Library (libpng) is supplied "AS IS".  The Contributing
 Authors and Group 42, Inc. disclaim all warranties, expressed or implied,
diff --git a/libpng.txt b/libpng.txt
index a68f3355..7fd60af3 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.0.4 - September 18, 1999
+ libpng version 1.0.4 - September 19, 1999
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999 Glenn Randers-Pehrson
diff --git a/libpngpf.3 b/libpngpf.3
index 81a4dd6d..c808ae8e 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 18, 1999"
+.TH LIBPNGPF 3 September 19, 1999
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 18, 1999
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.4 - September 19, 1999
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index c3e47108..0bfb1301 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 18, 1999"
+.TH PNG 5 "September 19, 1999"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 1cec3768..dfca0501 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * libpng version 1.0.4 - September 18, 1999
+ * libpng version 1.0.4 - September 19, 1999
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
@@ -352,7 +352,7 @@ png_get_copyright(png_structp png_ptr)
 {
    if(png_ptr == NULL)
      /* silence compiler warning about unused png_ptr */ ;
-   return("\n libpng version 1.0.4 - September 18, 1999\n\
+   return("\n libpng version 1.0.4 - September 19, 1999\n\
    Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\
    Copyright (c) 1996, 1997 Andreas Dilger\n\
    Copyright (c) 1998, 1999 Glenn Randers-Pehrson\n");
diff --git a/png.h b/png.h
index 571ddfaa..d3707038 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.0.4 - September 18, 1999
+ * libpng version 1.0.4 - September 19, 1999
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
@@ -9,7 +9,7 @@
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.89c, May 1996: Guy Schalnat
  *  libpng versions 0.90, December 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.0.4 - September 18, 1999: Glenn R-P
+ *  libpng versions 0.97, January 1998, through 1.0.4 - September 19, 1999: Glenn R-P
  *  See also "Contributing Authors", below.
  *
  * Y2K compliance in libpng:
@@ -137,7 +137,7 @@
  * Copyright (c) 1996, 1997 Andreas Dilger
  * (libpng versions 0.90, December 1996, through 0.96, May 1997)
  * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
- * (libpng versions 0.97, January 1998, through 1.0.4 - September 18, 1999)
+ * (libpng versions 0.97, January 1998, through 1.0.4, September 19, 1999)
  *
  * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
  * and Group 42, Inc. disclaim all warranties, expressed or implied,
@@ -150,11 +150,17 @@
  * Permission is hereby granted to use, copy, modify, and distribute this
  * source code, or portions hereof, for any purpose, without fee, subject
  * to the following restrictions:
- * 1. The origin of this source code must not be misrepresented.
- * 2. Altered versions must be plainly marked as such and must not be
- *    misrepresented as being the original source.
- * 3. This Copyright notice may not be removed or altered from any source or
- *    altered source distribution.
+ *
+ * 1. The origin of this source code must not be
+ *     misrepresented.
+ *
+ * 2. Altered versions must be plainly marked as such
+ *    and must not be misrepresented as being the
+ *    original source.
+ *
+ * 3. This Copyright notice may not be removed or
+ *    altered from any source or altered source
+ *    distribution.
  *
  * The Contributing Authors and Group 42, Inc. specifically permit, without
  * fee, and encourage the use of this source code as a component to
@@ -163,7 +169,6 @@
  * appreciated.
  */
 
-
 #ifndef _PNG_H
 #define _PNG_H
 
@@ -1605,7 +1610,7 @@ png_get_header_version(png_structp png_ptr)
 {
    if(png_ptr == NULL)
      /* silence compiler warning about unused png_ptr */ ;
-   return("\n libpng version 1.0.4 - September 18, 1999 (header)\n");
+   return("\n libpng version 1.0.4 - September 19, 1999 (header)\n");
 }
 #endif
 
diff --git a/pngasmrd.h b/pngasmrd.h
index 1b3c9625..ae9853cc 100644
--- a/pngasmrd.h
+++ b/pngasmrd.h
@@ -1,6 +1,6 @@
 /* pngasmrd.h - assembler version of utilities to read a PNG file
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1999 Glenn Randers-Pehrson
  *
diff --git a/pngconf.h b/pngconf.h
index b23d38b4..3f546bc5 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngerror.c b/pngerror.c
index ae113a7c..2d2cede0 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngget.c b/pngget.c
index 14e66a46..248db8e3 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngmem.c b/pngmem.c
index 637fa03b..06eb0909 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngpread.c b/pngpread.c
index 2429dba5..9d2fe488 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngread.c b/pngread.c
index 4c0f3ed8..fc700f48 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngrio.c b/pngrio.c
index 4e04a3e9..8d4390c2 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
 
 /* pngrio.c - functions for data input
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngrtran.c b/pngrtran.c
index 8601442c..f8b8e80d 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngrutil.c b/pngrutil.c
index 3e9c7089..c49ac619 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngset.c b/pngset.c
index 9e40996e..e0f9e0ac 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngtest.c b/pngtest.c
index cff23625..afd5c376 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngtrans.c b/pngtrans.c
index 8ecdb3bb..bf140185 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)
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngvcrd.c b/pngvcrd.c
index df924559..8f429d92 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
  *
  * For Intel CPU and Microsoft Visual C++ compiler
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, Intel Corporation
  * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
diff --git a/pngwio.c b/pngwio.c
index f332d150..3831acfb 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
 
 /* pngwio.c - functions for data output
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngwrite.c b/pngwrite.c
index 5afad37e..9a3c928e 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngwtran.c b/pngwtran.c
index d4ba4feb..10f50c0f 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
diff --git a/pngwutil.c b/pngwutil.c
index 35ab5582..446c4daf 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * libpng 1.0.4 - September 18, 1999
+ * libpng 1.0.4 - September 19, 1999
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger