diff --git a/ANNOUNCE b/ANNOUNCE index 631c5bdcd..d7a7812e4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -489,6 +489,7 @@ version 1.4.0beta64 [June 24, 2009] PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks. version 1.4.0beta65 [June 24, 2009] + Added a reference to the zlib-libpng license in each file. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index c68663763..7ac0a74fe 100644 --- a/CHANGES +++ b/CHANGES @@ -2166,6 +2166,7 @@ version 1.4.0beta64 [June 24, 2009] PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks. version 1.4.0beta65 [June 24, 2009] + Added a reference to the zlib-libpng license in each file. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h index e4e3b19f8..9641601b2 100644 --- a/contrib/pngminim/decoder/pngusr.h +++ b/contrib/pngminim/decoder/pngusr.h @@ -1,6 +1,10 @@ /* minrdpngconf.h: headers to make a minimal png-read-only library + * + * Copyright (c) 2007, 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib-libpng license. * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h index 65953c6a4..9f2020e74 100644 --- a/contrib/pngminim/encoder/pngusr.h +++ b/contrib/pngminim/encoder/pngusr.h @@ -1,6 +1,10 @@ /* minwrpngconf.h: headers to make a minimal png-write-only library + * + * Copyright (c) 2007, 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib-libpng license. * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h index f3b0038e6..cbbf81dac 100644 --- a/contrib/pngminim/preader/pngusr.h +++ b/contrib/pngminim/preader/pngusr.h @@ -1,6 +1,10 @@ /* minrdpngconf.h: headers to make a minimal png-read-only library + * + * Copyright (c) 2007, 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib-libpng license. * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c index 959afe9de..dbd5b184d 100644 --- a/contrib/visupng/PngFile.c +++ b/contrib/visupng/PngFile.c @@ -2,8 +2,11 @@ // PNGFILE.C -- Image File Functions //------------------------------------- -// Copyright 2000, Willem van Schaik. For conditions of distribution and -// use, see the copyright/license/disclaimer notice in png.h +// Copyright 2000, Willem van Schaik. +// +// This code is released under the zlib-libpng license. +// For conditions of distribution and use, see the +// copyright/license/disclaimer notice in png.h #include #include diff --git a/contrib/visupng/PngFile.h b/contrib/visupng/PngFile.h index a900fd4fd..8632125ca 100644 --- a/contrib/visupng/PngFile.h +++ b/contrib/visupng/PngFile.h @@ -2,8 +2,11 @@ // PNGFILE.H -- Header File for pngfile.c //------------------------------------------ -// Copyright 2000, Willem van Schaik. For conditions of distribution and -// use, see the copyright/license/disclaimer notice in png.h +// Copyright 2000, Willem van Schaik. +// +// This code is released under the zlib-libpng license. +// For conditions of distribution and use, see the +// copyright/license/disclaimer notice in png.h #include #include diff --git a/contrib/visupng/README.txt b/contrib/visupng/README.txt index 4a753d8e2..6b49cb287 100644 --- a/contrib/visupng/README.txt +++ b/contrib/visupng/README.txt @@ -1,8 +1,11 @@ Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng ------------------------------------------------------------------------ -Copyright 2000, Willem van Schaik. For conditions of distribution and -use, see the copyright/license/disclaimer notice in png.h +Copyright 2000, Willem van Schaik. + +This code is released under the zlib-libpng license. +For conditions of distribution and use, see the +copyright/license/disclaimer notice in png.h As a PNG .dll demo VisualPng is finished. More features would only hinder the program's objective. However, further extensions (like support for other diff --git a/contrib/visupng/VisualPng.c b/contrib/visupng/VisualPng.c index f2cf6ee9a..2fd0ea1f6 100644 --- a/contrib/visupng/VisualPng.c +++ b/contrib/visupng/VisualPng.c @@ -2,8 +2,11 @@ // VisualPng.C -- Shows a PNG image //------------------------------------ -// Copyright 2000, Willem van Schaik. For conditions of distribution and -// use, see the copyright/license/disclaimer notice in png.h +// Copyright 2000, Willem van Schaik. +// +// This code is released under the zlib-libpng license. +// For conditions of distribution and use, see the +// copyright/license/disclaimer notice in png.h // switches diff --git a/example.c b/example.c index 2571b145f..a647b063e 100644 --- a/example.c +++ b/example.c @@ -7,6 +7,7 @@ * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * */ /* This is an example of how to use libpng to read and write PNG files. diff --git a/png.c b/png.c index 72a1d20e0..659a21681 100644 --- a/png.c +++ b/png.c @@ -2,10 +2,13 @@ /* png.c - location for general purpose libpng functions * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #define PNG_NO_EXTERN diff --git a/png.h b/png.h index 74388e85c..2371192e1 100644 --- a/png.h +++ b/png.h @@ -6,6 +6,8 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * + * This code is released under the zlib-libpng license (See LICENSE, below) + * * 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 diff --git a/pngconf.h b/pngconf.h index bb25ab63d..a566d3952 100644 --- a/pngconf.h +++ b/pngconf.h @@ -6,6 +6,9 @@ * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * */ /* Any machine specific code is near the front of this file, so if you diff --git a/pngerror.c b/pngerror.c index dc04956a2..9a51d26d3 100644 --- a/pngerror.c +++ b/pngerror.c @@ -2,11 +2,13 @@ /* pngerror.c - stub functions for i/o and memory allocation * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file provides a location for all error handling. Users who * need special error handling are expected to write replacement functions * and use png_set_error_fn() to use those functions. See the instructions diff --git a/pngget.c b/pngget.c index 4d01c6ef8..632d325f4 100644 --- a/pngget.c +++ b/pngget.c @@ -2,10 +2,13 @@ /* pngget.c - retrieval of values from info struct * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #include "png.h" diff --git a/pngmem.c b/pngmem.c index 28ca4798a..eca9a2cbd 100644 --- a/pngmem.c +++ b/pngmem.c @@ -2,11 +2,13 @@ /* pngmem.c - stub functions for memory allocation * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file provides a location for all memory allocation. Users who * need special memory handling are expected to supply replacement * functions for png_malloc() and png_free(), and to use diff --git a/pngpread.c b/pngpread.c index 381346b31..ecef57c98 100644 --- a/pngpread.c +++ b/pngpread.c @@ -2,10 +2,13 @@ /* pngpread.c - read a png file in push mode * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #include "png.h" diff --git a/pngpriv.h b/pngpriv.h index 9eb3e04f5..7c034378a 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -6,6 +6,9 @@ * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * */ /* The symbols declared in this file (including the functions declared diff --git a/pngread.c b/pngread.c index b9420d783..f225039e6 100644 --- a/pngread.c +++ b/pngread.c @@ -2,11 +2,13 @@ /* pngread.c - read a PNG file * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file contains routines that an application calls directly to * read a PNG file or stream. */ diff --git a/pngrio.c b/pngrio.c index e57d1b7af..b44229c4b 100644 --- a/pngrio.c +++ b/pngrio.c @@ -2,11 +2,13 @@ /* pngrio.c - functions for data input * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file provides a location for all input. Users who need * special handling are expected to write a function that has the same * arguments as this and performs a similar function, but that possibly diff --git a/pngrtran.c b/pngrtran.c index 67d001fea..f1a2b6ad1 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -2,11 +2,13 @@ /* pngrtran.c - transforms the data in a row for PNG readers * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. * Transformations that are used in both reading and writing are diff --git a/pngrutil.c b/pngrutil.c index 40e4c0ead..027a85a25 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2,11 +2,13 @@ /* pngrutil.c - utilities to read a PNG file * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file contains routines that are only called from within * libpng itself during the course of reading an image. */ diff --git a/pngset.c b/pngset.c index f3c66c0f9..071b02612 100644 --- a/pngset.c +++ b/pngset.c @@ -2,11 +2,13 @@ /* pngset.c - storage of image information into info struct * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * The functions here are used during reads to store data from the file * into the info struct, and during writes to store application data * into the info struct for writing into the file. This abstracts the diff --git a/pngtest.c b/pngtest.c index 279279cc7..8f5c1b02e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2,11 +2,13 @@ /* pngtest.c - a simple test program to test libpng * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This program reads in a PNG image, writes it out again, and then * compares the two files. If the files are identical, this shows that * the basic chunk handling, filtering, and (de)compression code is working diff --git a/pngtrans.c b/pngtrans.c index f6174a2fd..cd9730a9d 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -2,10 +2,13 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #include "png.h" diff --git a/pngwio.c b/pngwio.c index e89e74bf8..0e7e8d0bb 100644 --- a/pngwio.c +++ b/pngwio.c @@ -2,11 +2,13 @@ /* pngwio.c - functions for data output * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * * This file provides a location for all output. Users who need * special handling are expected to write functions that have the same * arguments as these and perform similar functions, but that possibly diff --git a/pngwrite.c b/pngwrite.c index 0c66c7dcc..6d09f75ab 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -2,10 +2,13 @@ /* pngwrite.c - general routines to write a PNG file * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ /* get internal access to png.h */ diff --git a/pngwtran.c b/pngwtran.c index 0e1d00b61..5fd0962bb 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -2,10 +2,13 @@ /* pngwtran.c - transforms the data in a row for PNG writers * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #include "png.h" diff --git a/pngwutil.c b/pngwutil.c index f5a9f5ee1..fa99320fa 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -2,10 +2,13 @@ /* pngwutil.c - utilities to write a PNG file * * Last changed in libpng 1.4.0 [June 24, 2009] - * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 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.) + * + * This code is released under the zlib-libpng license. + * For conditions of distribution and use, see copyright notice in png.h + * */ #include "png.h" diff --git a/projects/visualc6/README.txt b/projects/visualc6/README.txt index 27375ee30..fd9628c40 100644 --- a/projects/visualc6/README.txt +++ b/projects/visualc6/README.txt @@ -2,6 +2,8 @@ Microsoft Developer Studio Project File, Format Version 6.00 for libpng. Copyright (C) 2000-2004 Simon-Pierre Cadieux. Copyright (C) 2004 Cosmin Truta. + +This code is released under the zlib-libpng license. For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/visualc71/README.txt b/projects/visualc71/README.txt index cc2ca85e5..87dc1ff52 100644 --- a/projects/visualc71/README.txt +++ b/projects/visualc71/README.txt @@ -1,6 +1,8 @@ Microsoft Developer Studio Project File, Format Version 7.10 for libpng. Copyright (C) 2004 Simon-Pierre Cadieux. + +This code is released under the zlib-libpng license. For conditions of distribution and use, see copyright notice in png.h Assumptions: diff --git a/projects/visualc71/README_zlib.txt b/projects/visualc71/README_zlib.txt index ff6a5c7cb..c6b0aa3f6 100644 --- a/projects/visualc71/README_zlib.txt +++ b/projects/visualc71/README_zlib.txt @@ -6,6 +6,8 @@ Microsoft Developer Studio Project File, Format Version 7.10 for zlib. Copyright (C) 2004 Simon-Pierre Cadieux. Copyright (C) 2004 Cosmin Truta. + +This code is released under the zlib-libpng license. For conditions of distribution and use, see copyright notice in zlib.h. diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c01b8be6f..a2c3a667a 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -2,6 +2,8 @@ project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson + +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h set(PNGLIB_MAJOR 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index fb6a0b783..865ca76f1 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -4,6 +4,8 @@ # provides configuration info for libpng. # Copyright (C) 2002 Glenn Randers-Pehrson + +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Modeled after libxml-config. diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in index 6475ffca2..ed017e556 100755 --- a/scripts/libpng-config.in +++ b/scripts/libpng-config.in @@ -4,6 +4,8 @@ # provides configuration info for libpng. # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson + +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Modeled after libxml-config. diff --git a/scripts/libpng.icc b/scripts/libpng.icc index f9c51af3a..c2a8862b2 100644 --- a/scripts/libpng.icc +++ b/scripts/libpng.icc @@ -1,7 +1,10 @@ // Project file for libpng (static) // IBM VisualAge/C++ version 4.0 or later // Copyright (C) 2000 Cosmin Truta +// +// This code is released under the zlib-libpng license. // For conditions of distribution and use, see copyright notice in png.h +// // Notes: // All modules are compiled in C mode // Tested with IBM VAC++ 4.0 under Win32 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 94409496c..6bbebf7ee 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -3,6 +3,8 @@ # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger + +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 278841b19..22e2ab099 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -3,6 +3,8 @@ # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger + +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ae70e33ad..00f8ae497 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -3,6 +3,8 @@ # Copyright (C) 2000 Cosmin Truta # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Location of the zlib library and include files diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index 79cb42499..f39c5b3f3 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -1,6 +1,8 @@ # Commodore Amiga Makefile # makefile for libpng and SAS C V6.5x compiler # Copyright (C) 1995-2000 Wolf Faust +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h diff --git a/scripts/makefile.atari b/scripts/makefile.atari index 9566d5d60..6a8ea63b9 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -1,7 +1,10 @@ # makefile for libpng # Copyright (C) 2002 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# # modified for LC56/ATARI assumes libz.lib is in same dir and uses default # rules for library management # diff --git a/scripts/makefile.beos b/scripts/makefile.beos index b2dd3a087..ab41654e9 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -3,6 +3,8 @@ # Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson # Copyright (C) 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 2c49a896a..f65efc1df 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -7,6 +7,8 @@ # and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by: # Copyright (C) 1998-2000 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # This makefile intends to support building outside the src directory diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index bc39865d3..1bc3527c4 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -4,6 +4,8 @@ # derived from makefile.linux: # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 76563ff3a..ed115a4c0 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -1,6 +1,8 @@ # makefile for libpng on DEC Alpha Unix # Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 5fc8addd6..1b33c4a68 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -1,6 +1,8 @@ # DJGPP (DOS gcc) makefile for libpng # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # where make install will put libpng.a and png.h diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 4bee3804d..3e2bd9c14 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -2,6 +2,8 @@ # Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs # and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Modified for Debian by Junichi Uekawa and Josselin Mouette diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index f4ab73732..de0b62571 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -1,5 +1,7 @@ # makefile for libpng under FreeBSD # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h PREFIX?= /usr/local diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index c4bfbf30c..a7c4548c6 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -2,6 +2,8 @@ # Copyright (C) 2008 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Location of the zlib library and include files diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index e4527d915..f84b23531 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -2,6 +2,8 @@ # Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Where the zlib library and include files are located diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index d04a0c0e9..cc6976037 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -3,6 +3,8 @@ # Copyright (C) 2001, Laurent faillie # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index d4431cfe1..cf828ecf2 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -2,6 +2,8 @@ # Copyright (C) 1999-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Where the zlib library and include files are located diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index f0fd860cd..4b3ecfdb3 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -2,7 +2,10 @@ # IBM C version 3.x for Win32 and OS/2 # Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# # Notes: # Derived from makefile.std # All modules are compiled in C mode diff --git a/scripts/makefile.intel b/scripts/makefile.intel index b830c06d6..24771adfa 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -4,10 +4,12 @@ # Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h - +# # To use, do "nmake /f scripts\makefile.intel" - +# # ------------------- Intel C/C++ Compiler 4.0 and later ------------------- # Where the zlib library and include files are located diff --git a/scripts/makefile.knr b/scripts/makefile.knr index d64e6584e..2ad0f88b9 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -1,8 +1,10 @@ # makefile for libpng # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h - +# # This makefile requires the file ansi2knr.c, which you can get # from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/ # If you have libjpeg, you probably already have ansi2knr.c in the jpeg diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 06a7103b7..e2f8ad585 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -2,6 +2,8 @@ # Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 7c6e5a48a..d5d4e019c 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -3,13 +3,15 @@ # of the library, and builds two copies of pngtest: one # statically linked and one dynamically linked. # -# Built from makefile.cygwin # Copyright (C) 2002, 2006, 2008 Soren Anderson, Charles Wilson, # and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by: # Copyright (C) 1998-2000, 2007 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# Built from makefile.cygwin # This makefile intends to support building outside the src directory # if desired. When invoking it, specify an argument to SRCDIR on the diff --git a/scripts/makefile.mips b/scripts/makefile.mips index ae9df26a8..6bb5f1417 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -1,6 +1,8 @@ # makefile for libpng # Copyright (C) Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # where make install puts libpng.a and png.h diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 8bc80a1ed..9416c4e46 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -1,7 +1,10 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2006, 2009 Glenn Randers-Pehrson +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # -------- Microsoft C 5.1 and later, does not use assembler code -------- diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 29ee34acf..b550bb823 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -3,6 +3,8 @@ # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.netbsd diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index a02129319..8ed681270 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -3,6 +3,8 @@ # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.ne0bsd diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index f19a74cec..01599b55f 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -2,6 +2,8 @@ # Copyright (C) 1998, 1999, 2002, 2006-2008 Greg Roelofs and # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 994f3d2c2..d0c95986b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -1,6 +1,8 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2007-2008 Glenn Randers-Pehrson +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h PREFIX?= /usr/local diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index 1704acc1b..c25044547 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -1,4 +1,6 @@ # makefile for libpng on OS/2 with gcc +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Related files: pngos2.def diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 93083fcb1..515394a9c 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -4,6 +4,8 @@ # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 7f759c404..3ed864f4c 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -1,6 +1,8 @@ # makefile for libpng.a and libpng14.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index c36937faa..bde27c1a3 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -1,6 +1,8 @@ # makefile for libpng.a and libpng14.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index cf8b4250e..cfb966050 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -4,6 +4,8 @@ # Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson # Copyright (C) 1998-2001 Greg Roelofs # Copyright (C) 1996-1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index edc497006..a8a9f9c0d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -3,6 +3,8 @@ # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # Library name: diff --git a/scripts/makefile.std b/scripts/makefile.std index 048add1b8..b720bd603 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -1,6 +1,8 @@ # makefile for libpng # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # where make install puts libpng.a and png.h diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 57977d838..3711bb7d1 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -1,6 +1,8 @@ # makefile for libpng # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # where make install puts libpng.a and png.h diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 297f809f3..f36862590 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -1,7 +1,10 @@ # makefile for libpng # Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcawin32" diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index ab7541a0d..9fb7caee6 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -1,7 +1,10 @@ # makefile for libpng # Copyright (C) 1998 Tim Wegner # Copyright (C) 2006,2009 Glenn Randers-Pehrson +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h +# # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcwin32" diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index 7b9858637..c54fb9720 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -3,6 +3,8 @@ # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h # To use, do "wmake /f scripts\makefile.watcom" diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc index e5c027841..8e6a6130a 100644 --- a/scripts/smakefile.ppc +++ b/scripts/smakefile.ppc @@ -1,6 +1,8 @@ # Amiga powerUP (TM) Makefile # makefile for libpng and SAS C V6.58/7.00 PPC compiler # Copyright (C) 1998 by Andreas R. Kleinert +# +# This code is released under the zlib-libpng license. # For conditions of distribution and use, see copyright notice in png.h CC = scppc