Binary files libpng-1.2.37/contrib/gregbook/toucan.png and libpng-1.2.38rc03/contrib/gregbook/toucan.png differ diff -ru4NwbB libpng-1.2.37/contrib/pngminim/decoder/pngusr.h libpng-1.2.38rc03/contrib/pngminim/decoder/pngusr.h --- libpng-1.2.37/contrib/pngminim/decoder/pngusr.h 2009-05-28 20:08:46.360706000 -0500 +++ libpng-1.2.38rc03/contrib/pngminim/decoder/pngusr.h 2009-06-26 07:54:10.792580000 -0500 @@ -1,7 +1,12 @@ /* minrdpngconf.h: headers to make a minimal png-read-only library - * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * + * Copyright (c) 2007, 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib/libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ #ifndef MINRDPNGCONF_H diff -ru4NwbB libpng-1.2.37/contrib/pngminim/encoder/pngusr.h libpng-1.2.38rc03/contrib/pngminim/encoder/pngusr.h --- libpng-1.2.37/contrib/pngminim/encoder/pngusr.h 2009-05-28 20:17:46.706727000 -0500 +++ libpng-1.2.38rc03/contrib/pngminim/encoder/pngusr.h 2009-06-26 07:53:12.934826000 -0500 @@ -1,7 +1,12 @@ /* minwrpngconf.h: headers to make a minimal png-write-only library - * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * + * Copyright (c) 2007, 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib/libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ #ifndef MINWRPNGCONF_H diff -ru4NwbB libpng-1.2.37/contrib/pngminim/preader/pngusr.h libpng-1.2.38rc03/contrib/pngminim/preader/pngusr.h --- libpng-1.2.37/contrib/pngminim/preader/pngusr.h 2009-05-28 20:09:02.982686000 -0500 +++ libpng-1.2.38rc03/contrib/pngminim/preader/pngusr.h 2009-06-26 07:57:06.082932000 -0500 @@ -1,12 +1,17 @@ /* minrdpngconf.h: headers to make a minimal png-read-only library - * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 2007 Glenn Randers-Pehrson + * + * Copyright (c) 2009 Glenn Randers-Pehrson + * + * This code is released under the zlib/libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson */ -#ifndef MINRDPNGCONF_H -#define MINRDPNGCONF_H +#ifndef MINPRDPNGCONF_H +#define MINPRDPNGCONF_H #define PNG_NO_GLOBAL_ARRAYS #define PNG_NO_WARNINGS @@ -59,5 +64,5 @@ #define PNG_NO_ZALLOC_ZERO #define PNG_NO_ERROR_NUMBERS #define PNG_NO_EASY_ACCESS -#endif /* MINRDPNGCONF_H */ +#endif /* MINPRDPNGCONF_H */ diff -ru4NwbB libpng-1.2.37/contrib/visupng/PngFile.c libpng-1.2.38rc03/contrib/visupng/PngFile.c --- libpng-1.2.37/contrib/visupng/PngFile.c 2000-06-30 07:57:19.000000000 -0500 +++ libpng-1.2.38rc03/contrib/visupng/PngFile.c 2009-07-11 06:38:54.233533000 -0500 @@ -1,10 +1,13 @@ //------------------------------------- // 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 libpng license. +// For conditions of distribution and use, see the disclaimer +// and license in png.h #include #include #include diff -ru4NwbB libpng-1.2.37/contrib/visupng/PngFile.h libpng-1.2.38rc03/contrib/visupng/PngFile.h --- libpng-1.2.37/contrib/visupng/PngFile.h 2000-06-05 18:21:40.000000000 -0500 +++ libpng-1.2.38rc03/contrib/visupng/PngFile.h 2009-07-11 06:39:30.105765000 -0500 @@ -1,10 +1,13 @@ //------------------------------------------ // 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 libpng license. +// For conditions of distribution and use, see the disclaimer +// and license in png.h #include #include #include diff -ru4NwbB libpng-1.2.37/contrib/visupng/README.txt libpng-1.2.38rc03/contrib/visupng/README.txt --- libpng-1.2.37/contrib/visupng/README.txt 2000-11-15 07:40:51.000000000 -0600 +++ libpng-1.2.38rc03/contrib/visupng/README.txt 2009-07-11 06:39:47.025922000 -0500 @@ -1,9 +1,12 @@ 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 libpng license. +For conditions of distribution and use, see the disclaimer +and license 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 graphics formats) are in development. To get these, or for pre-compiled diff -ru4NwbB libpng-1.2.37/contrib/visupng/VisualPng.c libpng-1.2.38rc03/contrib/visupng/VisualPng.c --- libpng-1.2.37/contrib/visupng/VisualPng.c 2000-06-07 23:22:42.000000000 -0500 +++ libpng-1.2.38rc03/contrib/visupng/VisualPng.c 2009-07-11 06:40:02.771814000 -0500 @@ -1,10 +1,13 @@ //------------------------------------ // 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 libpng license. +// For conditions of distribution and use, see the disclaimer +// and license in png.h // switches // defines diff -ru4NwbB libpng-1.2.37/png.c libpng-1.2.38rc03/png.c --- libpng-1.2.37/png.c 2009-06-05 16:59:03.459027740 -0500 +++ libpng-1.2.38rc03/png.c 2009-07-11 09:13:54.783416310 -0500 @@ -1,12 +1,15 @@ /* png.c - location for general purpose libpng functions * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL #define PNG_NO_EXTERN @@ -601,9 +604,9 @@ png_debug(1, "in png_info_destroy"); png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); -#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) +#if defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) if (png_ptr->num_chunk_list) { png_free(png_ptr, png_ptr->chunk_list); png_ptr->chunk_list=NULL; diff -ru4NwbB libpng-1.2.37/png.h libpng-1.2.38rc03/png.h --- libpng-1.2.37/png.h 2009-06-04 06:08:00.846261990 -0500 +++ libpng-1.2.38rc03/png.h 2009-07-11 09:13:54.627606872 -0500 @@ -4,8 +4,10 @@ * 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 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 * libpng versions 0.97, January 1998, through 1.2.38rc03 - July 11, 2009: Glenn @@ -228,8 +230,14 @@ * 1.2.36 13 10236 12.so.0.36[.0] * 1.2.37beta01-03 13 10237 12.so.0.37[.0] * 1.2.37rc01 13 10237 12.so.0.37[.0] * 1.2.37 13 10237 12.so.0.37[.0] + * 1.2.45 10 10045 12.so.0.45[.0] + * 1.0.46 10 10046 10.so.0.46[.0] + * 1.2.38beta01 13 10238 12.so.0.38[.0] + * 1.2.38rc01-02 13 10238 12.so.0.38[.0] + * 1.2.38 13 10238 12.so.0.38[.0] + * 1.0.47 10 10047 10.so.0.47[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be * used for changes in backward compatibility, as it is intended. The @@ -257,8 +265,10 @@ * * If you modify libpng you may insert additional notices immediately following * this sentence. * + * This code is released under the libpng license. + * * libpng versions 1.2.6, August 15, 2004, through 1.2.38rc03, July 11, 2009, are * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -443,9 +453,10 @@ #define PNG_LIBPNG_VER_MAJOR %MAJOR% #define PNG_LIBPNG_VER_MINOR %MINOR% #define PNG_LIBPNG_VER_RELEASE %RELEASE% /* This should match the numeric part of the final component of - * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ + * PNG_LIBPNG_VER_STRING, omitting any leading zero: + */ #define PNG_LIBPNG_VER_BUILD %BUILDNUM% /* Release Status */ @@ -468,9 +479,10 @@ /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * version 1.0.0 was mis-numbered 100 instead of 10000). From - * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ + * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release + */ #define PNG_LIBPNG_VER %VER_NUM% /* %MAJOR%.%MINOR%.%RELEASE% */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -551,9 +563,9 @@ #define png_voidp_NULL NULL #define png_write_status_ptr_NULL NULL #endif -/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */ +/* Variables declared in png.c - only it needs to define PNG_NO_EXTERN */ #if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN) /* Version information for C files, stored in png.c. This had better match * the version above. */ @@ -677,9 +689,10 @@ typedef png_text FAR * FAR * png_textpp; #endif /* Supported compression types for text in PNG files (tEXt, and zTXt). - * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */ + * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. + */ #define PNG_TEXT_COMPRESSION_NONE_WR -3 #define PNG_TEXT_COMPRESSION_zTXt_WR -2 #define PNG_TEXT_COMPRESSION_NONE -1 #define PNG_TEXT_COMPRESSION_zTXt 0 @@ -704,9 +717,10 @@ } png_time; typedef png_time FAR * png_timep; typedef png_time FAR * FAR * png_timepp; -#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) +#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \ + defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) /* png_unknown_chunk is a structure to hold queued chunks for which there is * no specific support. The idea is that we can use this to queue * up private chunks for output even though the library doesn't actually * know about their semantics. @@ -939,10 +953,11 @@ #ifdef PNG_FREE_ME_SUPPORTED png_uint_32 free_me; /* flags items libpng is responsible for freeing */ #endif -#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) - /* storage for unknown chunks that the library doesn't recognize. */ +#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \ + defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) + /* Storage for unknown chunks that the library doesn't recognize. */ png_unknown_chunkp unknown_chunks; png_size_t unknown_chunks_num; #endif @@ -955,9 +970,9 @@ png_byte iccp_compression; /* Always zero */ #endif #if defined(PNG_sPLT_SUPPORTED) - /* data on sPLT chunks (there may be more than one). */ + /* Data on sPLT chunks (there may be more than one). */ png_sPLT_tp splt_palettes; png_uint_32 splt_palettes_num; #endif @@ -1396,9 +1411,9 @@ png_voidp user_chunk_ptr; png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */ #endif -#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED int num_chunk_list; png_bytep chunk_list; #endif @@ -1477,9 +1492,9 @@ #endif /* New member added in libpng-1.0.25 and 1.2.17 */ #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) - /* storage for unknown chunk that the library doesn't recognize. */ + /* Storage for unknown chunk that the library doesn't recognize. */ png_unknown_chunk unknown_chunk; #endif /* New members added in libpng-1.2.26 */ @@ -1597,9 +1612,9 @@ extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr, png_infop info_ptr)); #ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED -/* read the information before the actual image data. */ +/* Read the information before the actual image data. */ extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr, png_infop info_ptr)); #endif @@ -1610,13 +1625,13 @@ #if !defined(_WIN32_WCE) /* "time.h" functions are not supported on WindowsCE */ #if defined(PNG_WRITE_tIME_SUPPORTED) -/* convert from a struct tm to png_time */ +/* Convert from a struct tm to png_time */ extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime, struct tm FAR * ttime)); -/* convert from time_t to png_time. Uses gmtime() */ +/* Convert from time_t to png_time. Uses gmtime() */ extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime, time_t ttime)); #endif /* PNG_WRITE_tIME_SUPPORTED */ #endif /* _WIN32_WCE */ @@ -1734,9 +1749,9 @@ #define PNG_BACKGROUND_GAMMA_UNIQUE 3 #endif #if defined(PNG_READ_16_TO_8_SUPPORTED) -/* strip the second byte of information from a 16-bit depth file. */ +/* Strip the second byte of information from a 16-bit depth file. */ extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr)); #endif #if defined(PNG_READ_DITHER_SUPPORTED) @@ -1770,76 +1785,76 @@ /* Flush the current PNG output buffer */ extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr)); #endif -/* optional update palette with requested transformations */ +/* Optional update palette with requested transformations */ extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr)); -/* optional call to update the users info structure */ +/* Optional call to update the users info structure */ extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr, png_infop info_ptr)); #ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED -/* read one or more rows of image data. */ +/* Read one or more rows of image data. */ extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr, png_bytepp row, png_bytepp display_row, png_uint_32 num_rows)); #endif #ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED -/* read a row of data. */ +/* Read a row of data. */ extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr, png_bytep row, png_bytep display_row)); #endif #ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED -/* read the whole image into memory at once. */ +/* Read the whole image into memory at once. */ extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr, png_bytepp image)); #endif -/* write a row of image data */ +/* Write a row of image data */ extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr, png_bytep row)); -/* write a few rows of image data */ +/* Write a few rows of image data */ extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr, png_bytepp row, png_uint_32 num_rows)); -/* write the image data */ +/* Write the image data */ extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr, png_bytepp image)); -/* writes the end of the PNG file. */ +/* Writes the end of the PNG file. */ extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr, png_infop info_ptr)); #ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED -/* read the end of the PNG file. */ +/* Read the end of the PNG file. */ extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr, png_infop info_ptr)); #endif -/* free any memory associated with the png_info_struct */ +/* Free any memory associated with the png_info_struct */ extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr, png_infopp info_ptr_ptr)); -/* free any memory associated with the png_struct and the png_info_structs */ +/* Free any memory associated with the png_struct and the png_info_structs */ extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); -/* free all memory used by the read (old method - NOT DLL EXPORTED) */ +/* Free all memory used by the read (old method - NOT DLL EXPORTED) */ extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); -/* free any memory associated with the png_struct and the png_info_structs */ +/* Free any memory associated with the png_struct and the png_info_structs */ extern PNG_EXPORT(void,png_destroy_write_struct) PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); -/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */ +/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */ extern void png_write_destroy PNGARG((png_structp png_ptr)); -/* set the libpng method of handling chunk CRC errors */ +/* Set the libpng method of handling chunk CRC errors */ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, int crit_action, int ancil_action)); /* Values for png_set_crc_action() to say how to handle CRC errors in @@ -1865,9 +1880,9 @@ * expense of compression can modify them. See the compression library * header file (zlib.h) for an explination of the compression functions. */ -/* set the filtering method(s) used by libpng. Currently, the only valid +/* Set the filtering method(s) used by libpng. Currently, the only valid * value for "method" is 0. */ extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method, int filters)); @@ -2062,13 +2077,13 @@ png_voidp progressive_ptr, png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn)); -/* returns the user pointer associated with the push read functions */ +/* Returns the user pointer associated with the push read functions */ extern PNG_EXPORT(png_voidp,png_get_progressive_ptr) PNGARG((png_structp png_ptr)); -/* function to be called when data becomes available */ +/* Function to be called when data becomes available */ extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr, png_infop info_ptr, png_bytep buffer, png_size_t buffer_size)); /* function that combines rows. Not very much different than the @@ -2088,9 +2103,9 @@ extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr, png_uint_32 size)); #endif -/* frees a pointer allocated by png_malloc() */ +/* Frees a pointer allocated by png_malloc() */ extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr)); #if defined(PNG_1_0_X) /* Function to allocate memory for zlib. */ @@ -2105,13 +2120,14 @@ extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num)); #ifdef PNG_FREE_ME_SUPPORTED /* Reassign responsibility for freeing existing data, whether allocated - * by libpng or by the application */ + * by libpng or by the application + */ extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask)); #endif -/* assignments for png_data_freer */ +/* Assignments for png_data_freer */ #define PNG_DESTROY_WILL_FREE_DATA 1 #define PNG_SET_WILL_FREE_DATA 1 #define PNG_USER_WILL_FREE_DATA 2 /* Flags for png_ptr->free_me and info_ptr->free_me */ @@ -2193,13 +2209,15 @@ png_infop info_ptr)); #if defined(PNG_INFO_IMAGE_SUPPORTED) /* Returns row_pointers, which is an array of pointers to scanlines that was -returned from png_read_png(). */ + * returned from png_read_png(). + */ extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr, png_infop info_ptr)); /* Set row_pointers, which is an array of pointers to scanlines for use -by png_write_png(). */ + * by png_write_png(). + */ extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)); #endif @@ -2498,10 +2516,10 @@ #endif #endif #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */ -#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) -/* provide a list of chunks and how they are to be handled, if the built-in +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED +/* Provide a list of chunks and how they are to be handled, if the built-in handling or default unknown chunk handling is not desired. Any chunks not listed will be handled in the default manner. The IHDR and IEND chunks must not be listed. keep = 0: follow default behaviour @@ -2510,23 +2528,24 @@ = 3: keep even if unsafe-to-copy */ extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp png_ptr, int keep, png_bytep chunk_list, int num_chunks)); +PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep + chunk_name)); +#endif +#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr, png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)); extern PNG_EXPORT(void, png_set_unknown_chunk_location) PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location)); extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp png_ptr, png_infop info_ptr, png_unknown_chunkpp entries)); #endif -#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED -PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep - chunk_name)); -#endif /* Png_free_data() will turn off the "valid" flag for anything it frees. - If you need to turn it off for a chunk that your application has freed, - you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */ + * If you need to turn it off for a chunk that your application has freed, + * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); + */ extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr, png_infop info_ptr, int mask)); #if defined(PNG_INFO_IMAGE_SUPPORTED) @@ -2569,10 +2588,11 @@ #define PNG_DEBUG_FILE stderr #endif /* PNG_DEBUG_FILE */ #if (PNG_DEBUG > 1) -/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on - * non-ISO compilers */ +/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on non-ISO + * compilers. + */ # ifdef __STDC__ # ifndef png_debug # define png_debug(l,m) \ { \ @@ -2731,9 +2751,10 @@ #endif /* PNG_1_0_X */ #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ /* Strip the prepended error numbers ("#nnn ") from error and warning - * messages before passing them to the error or warning handler. */ + * messages before passing them to the error or warning handler. + */ #ifdef PNG_ERROR_NUMBERS_SUPPORTED extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp png_ptr, png_uint_32 strip_mode)); #endif @@ -2748,9 +2769,11 @@ png_ptr)); #endif -/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ +/* Maintainer: Put new public prototypes here ^, in libpng.3, and in + * project defs + */ #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on * most machines. However, it does take more operations than the corresponding @@ -2777,9 +2800,9 @@ + (png_uint_32)(bg)*(png_uint_32)(65535L - \ (png_uint_32)(alpha)) + (png_uint_32)32768L); \ (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); } -#else /* standard method using integer division */ +#else /* Standard method using integer division */ # define png_composite(composite, fg, alpha, bg) \ (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) + \ (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \ @@ -2860,9 +2883,9 @@ #define PNG_BACKGROUND_IS_GRAY 0x800 #define PNG_HAVE_PNG_SIGNATURE 0x1000 #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ -/* flags for the transformations the PNG library does on the image data */ +/* Flags for the transformations the PNG library does on the image data */ #define PNG_BGR 0x0001 #define PNG_INTERLACE 0x0002 #define PNG_PACK 0x0004 #define PNG_SHIFT 0x0008 @@ -2894,9 +2917,9 @@ /* 0x10000000L unused */ /* 0x20000000L unused */ /* 0x40000000L unused */ -/* flags for png_create_struct */ +/* Flags for png_create_struct */ #define PNG_STRUCT_PNG 0x0001 #define PNG_STRUCT_INFO 0x0002 /* Scaling factor for filter heuristic weighting calculations */ @@ -2904,9 +2927,9 @@ #define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT)) #define PNG_COST_SHIFT 3 #define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT)) -/* flags for the png_ptr->flags rather than declaring a byte for each one */ +/* Flags for the png_ptr->flags rather than declaring a byte for each one */ #define PNG_FLAG_ZLIB_CUSTOM_STRATEGY 0x0001 #define PNG_FLAG_ZLIB_CUSTOM_LEVEL 0x0002 #define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL 0x0004 #define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS 0x0008 @@ -2946,9 +2969,9 @@ #define PNG_FLAG_CRC_MASK (PNG_FLAG_CRC_ANCILLARY_MASK | \ PNG_FLAG_CRC_CRITICAL_MASK) -/* save typing and make code easier to understand */ +/* Save typing and make code easier to understand */ #define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \ abs((int)((c1).green) - (int)((c2).green)) + \ abs((int)((c1).blue) - (int)((c2).blue))) @@ -2959,15 +2982,16 @@ ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \ (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) ) /* PNG_OUT_OF_RANGE returns true if value is outside the range - ideal-delta..ideal+delta. Each argument is evaluated twice. - "ideal" and "delta" should be constants, normally simple - integers, "value" a variable. Added to libpng-1.2.6 JB */ + * ideal-delta..ideal+delta. Each argument is evaluated twice. + * "ideal" and "delta" should be constants, normally simple + * integers, "value" a variable. Added to libpng-1.2.6 JB + */ #define PNG_OUT_OF_RANGE(value, ideal, delta) \ ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) ) -/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */ +/* Variables declared in png.c - only it needs to define PNG_NO_EXTERN */ #if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN) /* place to hold the signature string for a PNG file. */ #ifdef PNG_USE_GLOBAL_ARRAYS PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig[8]; @@ -3086,9 +3110,10 @@ PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size)); #endif /* Next four functions are used internally as callbacks. PNGAPI is required - * but not PNG_EXPORT. PNGAPI added at libpng version 1.2.3. */ + * but not PNG_EXPORT. PNGAPI added at libpng version 1.2.3. + */ PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr, png_bytep data, png_size_t length)); @@ -3151,12 +3176,12 @@ #if defined(PNG_WRITE_FLUSH_SUPPORTED) PNG_EXTERN void png_flush PNGARG((png_structp png_ptr)); #endif -/* simple function to write the signature */ +/* Simple function to write the signature */ PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr)); -/* write various chunks */ +/* Write various chunks */ /* Write the IHDR chunk, and update the png_struct with the necessary * information. */ @@ -3306,14 +3331,14 @@ #if defined(PNG_READ_GAMMA_SUPPORTED) PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr)); #endif -/* combine a row of data, dealing with alpha, etc. if requested */ +/* Combine a row of data, dealing with alpha, etc. if requested */ PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row, int mask)); #if defined(PNG_READ_INTERLACING_SUPPORTED) -/* expand an interlaced row */ +/* Expand an interlaced row */ /* OLD pre-1.0.9 interface: PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info, png_bytep row, int pass, png_uint_32 transformations)); */ @@ -3322,14 +3347,14 @@ /* GRR TO DO (2.0 or whenever): simplify other internal calling interfaces */ #if defined(PNG_WRITE_INTERLACING_SUPPORTED) -/* grab pixels out of a row for an interlaced pass */ +/* Grab pixels out of a row for an interlaced pass */ PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info, png_bytep row, int pass)); #endif -/* unfilter a row */ +/* Unfilter a row */ PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr, png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter)); /* Choose the best filter to use and filter the row data */ @@ -3338,18 +3363,18 @@ /* Write out the filtered row. */ PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr, png_bytep filtered_row)); -/* finish a row while reading, dealing with interlacing passes, etc. */ +/* Finish a row while reading, dealing with interlacing passes, etc. */ PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr)); -/* initialize the row buffers, etc. */ +/* Initialize the row buffers, etc. */ PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr)); -/* optional call to update the users info structure */ +/* Optional call to update the users info structure */ PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr, png_infop info_ptr)); -/* these are the functions that do the transformations */ +/* These are the functions that do the transformations */ #if defined(PNG_READ_FILLER_SUPPORTED) PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info, png_bytep row, png_uint_32 filler, png_uint_32 flags)); #endif @@ -3469,9 +3494,9 @@ /* The following decodes the appropriate chunks, and does error correction, * then calls the appropriate callback for the chunk if it is valid. */ -/* decode the IHDR chunk */ +/* Decode the IHDR chunk */ PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 length)); PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr, png_uint_32 length)); @@ -3568,9 +3593,9 @@ PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr, png_bytep chunk_name)); -/* handle the transformations for reading and writing */ +/* Handle the transformations for reading and writing */ PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr)); PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr)); PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr)); @@ -3680,6 +3705,6 @@ } #endif #endif /* PNG_VERSION_INFO_ONLY */ -/* do not put anything past this line */ +/* Do not put anything past this line */ #endif /* PNG_H */ diff -ru4NwbB libpng-1.2.37/pngconf.h libpng-1.2.38rc03/pngconf.h --- libpng-1.2.37/pngconf.h 2009-06-04 06:08:00.854837565 -0500 +++ libpng-1.2.38rc03/pngconf.h 2009-07-11 09:13:54.696850167 -0500 @@ -1,12 +1,15 @@ /* pngconf.h - machine configurable file for libpng * * libpng version 1.2.38rc03 - July 11, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ /* Any machine specific code is near the front of this file, so if you * are configuring libpng for a machine, you may want to read the section @@ -486,9 +489,9 @@ /* The size of the png_text structure changed in libpng-1.0.6 when * iTXt support was added. iTXt support was turned off by default through * libpng-1.2.x, to support old apps that malloc the png_text structure * instead of calling png_set_text() and letting libpng malloc it. It - * was turned on by default in libpng-1.3.0. + * will be turned on by default in libpng-1.4.0. */ #if defined(PNG_1_0_X) || defined (PNG_1_2_X) # ifndef PNG_NO_iTXt_SUPPORTED @@ -520,8 +523,9 @@ #ifdef PNG_LEGACY_SUPPORTED # define PNG_NO_FREE_ME # define PNG_NO_READ_UNKNOWN_CHUNKS # define PNG_NO_WRITE_UNKNOWN_CHUNKS +# define PNG_NO_HANDLE_AS_UNKNOWN # define PNG_NO_READ_USER_CHUNKS # define PNG_NO_READ_iCCP # define PNG_NO_WRITE_iCCP # define PNG_NO_READ_iTXt @@ -549,9 +553,9 @@ #ifndef PNG_NO_FREE_ME # define PNG_FREE_ME_SUPPORTED #endif -#if defined(PNG_READ_SUPPORTED) +#ifdef PNG_READ_SUPPORTED #if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \ !defined(PNG_NO_READ_TRANSFORMS) # define PNG_READ_TRANSFORMS_SUPPORTED @@ -637,9 +641,9 @@ #endif #endif /* PNG_READ_SUPPORTED */ -#if defined(PNG_WRITE_SUPPORTED) +#ifdef PNG_WRITE_SUPPORTED # if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \ !defined(PNG_NO_WRITE_TRANSFORMS) # define PNG_WRITE_TRANSFORMS_SUPPORTED @@ -939,16 +943,24 @@ #ifndef PNG_NO_READ_zTXt # define PNG_READ_zTXt_SUPPORTED # define PNG_zTXt_SUPPORTED #endif +#ifndef PNG_NO_READ_OPT_PLTE +# define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */ +#endif /* optional PLTE chunk in RGB and RGBA images */ +#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \ + defined(PNG_READ_zTXt_SUPPORTED) +# define PNG_READ_TEXT_SUPPORTED +# define PNG_TEXT_SUPPORTED +#endif + +#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */ + #ifndef PNG_NO_READ_UNKNOWN_CHUNKS # define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED # define PNG_UNKNOWN_CHUNKS_SUPPORTED # endif -# ifndef PNG_NO_HANDLE_AS_UNKNOWN -# define PNG_HANDLE_AS_UNKNOWN_SUPPORTED -# endif #endif #if !defined(PNG_NO_READ_USER_CHUNKS) && \ defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) # define PNG_READ_USER_CHUNKS_SUPPORTED @@ -959,19 +971,16 @@ # ifdef PNG_NO_HANDLE_AS_UNKNOWN # undef PNG_NO_HANDLE_AS_UNKNOWN # endif #endif -#ifndef PNG_NO_READ_OPT_PLTE -# define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */ -#endif /* optional PLTE chunk in RGB and RGBA images */ -#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \ - defined(PNG_READ_zTXt_SUPPORTED) -# define PNG_READ_TEXT_SUPPORTED -# define PNG_TEXT_SUPPORTED -#endif -#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */ +#ifndef PNG_NO_HANDLE_AS_UNKNOWN +# ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED +# define PNG_HANDLE_AS_UNKNOWN_SUPPORTED +# endif +#endif +#ifdef PNG_WRITE_SUPPORTED #ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED #ifdef PNG_NO_WRITE_TEXT # define PNG_NO_WRITE_iTXt @@ -1081,28 +1090,31 @@ # ifndef PNG_zTXt_SUPPORTED # define PNG_zTXt_SUPPORTED # endif #endif +#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \ + defined(PNG_WRITE_zTXt_SUPPORTED) +# define PNG_WRITE_TEXT_SUPPORTED +# ifndef PNG_TEXT_SUPPORTED +# define PNG_TEXT_SUPPORTED +# endif +#endif + +#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */ + #ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS # define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED # define PNG_UNKNOWN_CHUNKS_SUPPORTED # endif +#endif + # ifndef PNG_NO_HANDLE_AS_UNKNOWN # ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED # define PNG_HANDLE_AS_UNKNOWN_SUPPORTED # endif # endif -#endif -#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \ - defined(PNG_WRITE_zTXt_SUPPORTED) -# define PNG_WRITE_TEXT_SUPPORTED -# ifndef PNG_TEXT_SUPPORTED -# define PNG_TEXT_SUPPORTED -# endif -#endif - -#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */ +#endif /* PNG_WRITE_SUPPORTED */ /* Turn this off to disable png_read_png() and * png_write_png() and leave the row_pointers member * out of the info structure. @@ -1247,9 +1259,9 @@ typedef char FAR * FAR * FAR * png_charppp; #if defined(PNG_1_0_X) || defined(PNG_1_2_X) /* SPC - Is this stuff deprecated? */ -/* It'll be removed as of libpng-1.3.0 - GR-P */ +/* It'll be removed as of libpng-1.4.0 - GR-P */ /* libpng typedefs for types in zlib. If zlib changes * or another compression library is used, then change these. * Eliminates need to change all the source files. */ diff -ru4NwbB libpng-1.2.37/pngerror.c libpng-1.2.38rc03/pngerror.c --- libpng-1.2.37/pngerror.c 2009-06-05 16:59:05.723736512 -0500 +++ libpng-1.2.38rc03/pngerror.c 2009-07-11 09:13:54.805402797 -0500 @@ -1,13 +1,16 @@ /* pngerror.c - stub functions for i/o and memory allocation * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * at each function. diff -ru4NwbB libpng-1.2.37/pngget.c libpng-1.2.38rc03/pngget.c --- libpng-1.2.37/pngget.c 2009-06-05 16:59:25.654764958 -0500 +++ libpng-1.2.38rc03/pngget.c 2009-07-11 09:13:54.857587814 -0500 @@ -1,12 +1,16 @@ /* pngget.c - retrieval of values from info struct * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * */ #define PNG_INTERNAL #include "png.h" diff -ru4NwbB libpng-1.2.37/pngmem.c libpng-1.2.38rc03/pngmem.c --- libpng-1.2.37/pngmem.c 2009-06-05 16:59:38.350158969 -0500 +++ libpng-1.2.38rc03/pngmem.c 2009-07-11 09:13:54.888036373 -0500 @@ -1,13 +1,16 @@ /* pngmem.c - stub functions for memory allocation * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * png_create_read_struct_2() and png_create_write_struct_2() to diff -ru4NwbB libpng-1.2.37/pngpread.c libpng-1.2.38rc03/pngpread.c --- libpng-1.2.37/pngpread.c 2009-06-05 16:59:40.751359154 -0500 +++ libpng-1.2.38rc03/pngpread.c 2009-07-11 09:13:54.956266318 -0500 @@ -1,12 +1,15 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.37 [June 4, 2009] - * For conditions of distribution and use, see copyright notice in png.h + * Last changed in libpng 1.2.37 [July 11, 2009] * 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL #include "png.h" diff -ru4NwbB libpng-1.2.37/pngread.c libpng-1.2.38rc03/pngread.c --- libpng-1.2.37/pngread.c 2009-06-05 16:59:43.522126241 -0500 +++ libpng-1.2.38rc03/pngread.c 2009-07-11 09:13:55.024792979 -0500 @@ -1,13 +1,16 @@ /* pngread.c - read a PNG file * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * * This file contains routines that an application calls directly to * read a PNG file or stream. */ diff -ru4NwbB libpng-1.2.37/pngrio.c libpng-1.2.38rc03/pngrio.c --- libpng-1.2.37/pngrio.c 2009-06-05 16:59:47.115519184 -0500 +++ libpng-1.2.38rc03/pngrio.c 2009-07-11 09:13:55.041131755 -0500 @@ -1,13 +1,16 @@ /* pngrio.c - functions for data input * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * has a different input method. Note that you shouldn't change this diff -ru4NwbB libpng-1.2.37/pngrtran.c libpng-1.2.38rc03/pngrtran.c --- libpng-1.2.37/pngrtran.c 2009-06-05 16:59:49.666038772 -0500 +++ libpng-1.2.38rc03/pngrtran.c 2009-07-11 09:13:55.235576754 -0500 @@ -1,13 +1,16 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.37 [June 4, 2009] - * For conditions of distribution and use, see copyright notice in png.h + * Last changed in libpng 1.2.38 [July 11, 2009] * 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * in pngtrans.c. @@ -713,10 +716,10 @@ } #endif #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_LEGACY_SUPPORTED) + defined(PNG_LEGACY_SUPPORTED) || \ + defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) void PNGAPI png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr read_user_transform_fn) { @@ -1176,12 +1179,8 @@ if (png_ptr->num_trans) { if (png_ptr->transformations & PNG_EXPAND_tRNS) info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; -#if 0 /* Removed from libpng-1.2.27 */ - else - info_ptr->color_type |= PNG_COLOR_MASK_COLOR; -#endif } if (info_ptr->bit_depth < 8) info_ptr->bit_depth = 8; info_ptr->num_trans = 0; diff -ru4NwbB libpng-1.2.37/pngrutil.c libpng-1.2.38rc03/pngrutil.c --- libpng-1.2.37/pngrutil.c 2009-06-05 16:59:52.099137425 -0500 +++ libpng-1.2.38rc03/pngrutil.c 2009-07-11 09:13:55.368886918 -0500 @@ -1,13 +1,16 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.37 [June 4, 2009] - * For conditions of distribution and use, see copyright notice in png.h + * Last changed in libpng 1.2.38 [July 11, 2009] * 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + * * This file contains routines that are only called from within * libpng itself during the course of reading an image. */ @@ -2250,9 +2253,9 @@ } if (!(png_ptr->chunk_name[0] & 0x20)) { -#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) +#if defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) != PNG_HANDLE_CHUNK_ALWAYS #if defined(PNG_READ_USER_CHUNKS_SUPPORTED) && png_ptr->read_user_chunk_fn == NULL @@ -2262,10 +2265,13 @@ png_chunk_error(png_ptr, "unknown critical chunk"); } #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) - if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS) || - (png_ptr->read_user_chunk_fn != NULL)) + if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS) +#if defined(PNG_READ_USER_CHUNKS_SUPPORTED) + || (png_ptr->read_user_chunk_fn != NULL) +#endif + ) { #ifdef PNG_MAX_MALLOC_64K if (length > (png_uint_32)65535L) { @@ -2297,10 +2303,12 @@ png_chunk_error(png_ptr, "error in user chunk"); if (ret == 0) { if (!(png_ptr->chunk_name[0] & 0x20)) +#if defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name) != PNG_HANDLE_CHUNK_ALWAYS) +#endif png_chunk_error(png_ptr, "unknown critical chunk"); png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1); } diff -ru4NwbB libpng-1.2.37/pngset.c libpng-1.2.38rc03/pngset.c --- libpng-1.2.37/pngset.c 2009-06-05 16:59:54.799108022 -0500 +++ libpng-1.2.38rc03/pngset.c 2009-07-11 09:13:55.426324599 -0500 @@ -1,13 +1,16 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.37 [June 4, 2009] - * For conditions of distribution and use, see copyright notice in png.h + * Last changed in libpng 1.2.38 [July 11, 2009] * 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * info struct and allows us to change the structure in the future. diff -ru4NwbB libpng-1.2.37/pngtest.c libpng-1.2.38rc03/pngtest.c --- libpng-1.2.37/pngtest.c 2009-06-05 16:59:57.565907530 -0500 +++ libpng-1.2.38rc03/pngtest.c 2009-07-11 09:13:55.499586405 -0500 @@ -1,13 +1,16 @@ /* pngtest.c - a simple test program to test libpng * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * properly. It does not currently test all of the transforms, although diff -ru4NwbB libpng-1.2.37/pngtrans.c libpng-1.2.38rc03/pngtrans.c --- libpng-1.2.37/pngtrans.c 2009-06-04 06:08:00.962926722 -0500 +++ libpng-1.2.38rc03/pngtrans.c 2009-07-11 09:13:55.533210593 -0500 @@ -1,12 +1,15 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * * Last changed in libpng 1.2.36 [May 14, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL #include "png.h" @@ -633,10 +636,10 @@ } #endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */ #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \ - defined(PNG_LEGACY_SUPPORTED) + defined(PNG_LEGACY_SUPPORTED) || \ + defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) void PNGAPI png_set_user_transform_info(png_structp png_ptr, png_voidp user_transform_ptr, int user_transform_depth, int user_transform_channels) { diff -ru4NwbB libpng-1.2.37/pngwio.c libpng-1.2.38rc03/pngwio.c --- libpng-1.2.37/pngwio.c 2009-06-05 17:00:01.757538264 -0500 +++ libpng-1.2.38rc03/pngwio.c 2009-07-11 09:13:55.560573958 -0500 @@ -1,13 +1,16 @@ /* pngwio.c - functions for data output * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license 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 * use different output methods. Note that you shouldn't change these diff -ru4NwbB libpng-1.2.37/pngwrite.c libpng-1.2.38rc03/pngwrite.c --- libpng-1.2.37/pngwrite.c 2009-06-05 17:00:05.287227880 -0500 +++ libpng-1.2.38rc03/pngwrite.c 2009-07-11 09:13:55.629182797 -0500 @@ -1,12 +1,15 @@ /* pngwrite.c - general routines to write a PNG file * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ /* Get internal access to png.h */ #define PNG_INTERNAL diff -ru4NwbB libpng-1.2.37/pngwtran.c libpng-1.2.38rc03/pngwtran.c --- libpng-1.2.37/pngwtran.c 2009-06-05 17:00:07.886294964 -0500 +++ libpng-1.2.38rc03/pngwtran.c 2009-07-11 09:13:55.660261666 -0500 @@ -1,12 +1,15 @@ /* pngwtran.c - transforms the data in a row for PNG writers * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL #include "png.h" diff -ru4NwbB libpng-1.2.37/pngwutil.c libpng-1.2.38rc03/pngwutil.c --- libpng-1.2.37/pngwutil.c 2009-06-05 17:00:25.615989075 -0500 +++ libpng-1.2.38rc03/pngwutil.c 2009-07-11 09:13:55.775244217 -0500 @@ -1,12 +1,15 @@ /* pngwutil.c - utilities to write a PNG file * * Last changed in libpng 1.2.37 [June 4, 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 libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h */ #define PNG_INTERNAL #include "png.h" diff -ru4NwbB libpng-1.2.37/scripts/CMakeLists.txt libpng-1.2.38rc03/scripts/CMakeLists.txt --- libpng-1.2.37/scripts/CMakeLists.txt 2009-06-04 06:08:02.452868627 -0500 +++ libpng-1.2.38rc03/scripts/CMakeLists.txt 2009-07-11 09:13:58.836677581 -0500 @@ -1,9 +1,12 @@ project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h set(PNGLIB_MAJOR %MAJOR%) set(PNGLIB_MINOR %MINOR%) set(PNGLIB_RELEASE %RELEASE%) diff -ru4NwbB libpng-1.2.37/scripts/libpng-config-head.in libpng-1.2.38rc03/scripts/libpng-config-head.in --- libpng-1.2.37/scripts/libpng-config-head.in 2009-06-04 06:08:02.461393636 -0500 +++ libpng-1.2.38rc03/scripts/libpng-config-head.in 2009-07-11 09:13:58.854510083 -0500 @@ -3,9 +3,12 @@ # libpng-config # provides configuration info for libpng. # Copyright (C) 2002 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Modeled after libxml-config. version=1.2.38rc03 diff -ru4NwbB libpng-1.2.37/scripts/libpng-config.in libpng-1.2.38rc03/scripts/libpng-config.in --- libpng-1.2.37/scripts/libpng-config.in 2009-06-04 06:08:02.262156301 -0500 +++ libpng-1.2.38rc03/scripts/libpng-config.in 2009-07-11 09:13:58.421759581 -0500 @@ -3,9 +3,12 @@ # libpng-config # provides configuration info for libpng. # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Modeled after libxml-config. version="@PNGLIB_VERSION@" diff -ru4NwbB libpng-1.2.37/scripts/libpng.icc libpng-1.2.38rc03/scripts/libpng.icc --- libpng-1.2.37/scripts/libpng.icc 2000-06-03 08:38:23.000000000 -0500 +++ libpng-1.2.38rc03/scripts/libpng.icc 2009-06-26 21:36:09.521127000 -0500 @@ -1,14 +1,17 @@ // Project file for libpng (static) // IBM VisualAge/C++ version 4.0 or later // Copyright (C) 2000 Cosmin Truta -// For conditions of distribution and use, see copyright notice in png.h +// +// This code is released under the libpng license. +// For conditions of distribution and use, see the disclaimer +// and license in png.h +// // Notes: // All modules are compiled in C mode // Tested with IBM VAC++ 4.0 under Win32 // Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32 // Can be easily adapted for IBM VAC++ 4.0 or later under AIX -// For conditions of distribution and use, see copyright notice in png.h option incl(searchpath, "../zlib"), opt(level, "2"), link(libsearchpath, "../zlib") { diff -ru4NwbB libpng-1.2.37/scripts/makefile.32sunu libpng-1.2.38rc03/scripts/makefile.32sunu --- libpng-1.2.37/scripts/makefile.32sunu 2009-06-04 06:08:02.479532324 -0500 +++ libpng-1.2.38rc03/scripts/makefile.32sunu 2009-07-11 09:13:58.913283819 -0500 @@ -2,9 +2,12 @@ # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME=libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.64sunu libpng-1.2.38rc03/scripts/makefile.64sunu --- libpng-1.2.37/scripts/makefile.64sunu 2009-06-04 06:08:02.489394641 -0500 +++ libpng-1.2.38rc03/scripts/makefile.64sunu 2009-07-11 09:13:58.955198863 -0500 @@ -2,9 +2,12 @@ # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME=libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.aix libpng-1.2.38rc03/scripts/makefile.aix --- libpng-1.2.37/scripts/makefile.aix 2009-06-04 06:08:02.498306243 -0500 +++ libpng-1.2.38rc03/scripts/makefile.aix 2009-07-11 09:13:58.981932689 -0500 @@ -2,9 +2,12 @@ # Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson # 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. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Location of the zlib library and include files ZLIBINC = ../zlib ZLIBLIB = ../zlib diff -ru4NwbB libpng-1.2.37/scripts/makefile.amiga libpng-1.2.38rc03/scripts/makefile.amiga --- libpng-1.2.37/scripts/makefile.amiga 2000-11-22 07:44:00.000000000 -0600 +++ libpng-1.2.38rc03/scripts/makefile.amiga 2009-06-26 21:36:09.588863000 -0500 @@ -1,8 +1,11 @@ # Commodore Amiga Makefile # makefile for libpng and SAS C V6.5x compiler # Copyright (C) 1995-2000 Wolf Faust -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h # # Location/path of zlib include files diff -ru4NwbB libpng-1.2.37/scripts/makefile.atari libpng-1.2.38rc03/scripts/makefile.atari --- libpng-1.2.37/scripts/makefile.atari 2002-05-23 08:28:38.000000000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.atari 2009-06-26 21:36:09.598483000 -0500 @@ -1,9 +1,13 @@ # makefile for libpng # Copyright (C) 2002 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# 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 + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h + +# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default # rules for library management # CFLAGS=-I..\zlib -O LBR = png.lib diff -ru4NwbB libpng-1.2.37/scripts/makefile.beos libpng-1.2.38rc03/scripts/makefile.beos --- libpng-1.2.37/scripts/makefile.beos 2009-06-04 06:08:02.507777058 -0500 +++ libpng-1.2.38rc03/scripts/makefile.beos 2009-07-11 09:13:59.030497147 -0500 @@ -2,9 +2,12 @@ # modified from makefile.linux by Sander Stoks # Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson # Copyright (C) 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME=libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.cygwin libpng-1.2.38rc03/scripts/makefile.cygwin --- libpng-1.2.37/scripts/makefile.cygwin 2009-06-04 06:08:02.519488254 -0500 +++ libpng-1.2.38rc03/scripts/makefile.cygwin 2009-07-11 09:13:59.076852595 -0500 @@ -6,9 +6,12 @@ # 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 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # This makefile intends to support building outside the src directory # if desired. When invoking it, specify an argument to SRCDIR on the # command line that points to the top of the directory where your source diff -ru4NwbB libpng-1.2.37/scripts/makefile.darwin libpng-1.2.38rc03/scripts/makefile.darwin --- libpng-1.2.37/scripts/makefile.darwin 2009-06-04 06:08:02.530608197 -0500 +++ libpng-1.2.38rc03/scripts/makefile.darwin 2009-07-11 09:13:59.117782183 -0500 @@ -3,9 +3,12 @@ # Copyright (C) 2001 Christoph Pfisterer # derived from makefile.linux: # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # where "make install" puts libpng.a, libpng%N%.dylib, png.h and pngconf.h prefix=/usr/local exec_prefix=$(prefix) diff -ru4NwbB libpng-1.2.37/scripts/makefile.dec libpng-1.2.38rc03/scripts/makefile.dec --- libpng-1.2.37/scripts/makefile.dec 2009-06-04 06:08:02.540180202 -0500 +++ libpng-1.2.38rc03/scripts/makefile.dec 2009-07-11 09:13:59.154248238 -0500 @@ -1,8 +1,11 @@ # makefile for libpng on DEC Alpha Unix # Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: PNGMAJ = %SONUM% PNGMIN = 1.2.38rc03 diff -ru4NwbB libpng-1.2.37/scripts/makefile.dj2 libpng-1.2.38rc03/scripts/makefile.dj2 --- libpng-1.2.37/scripts/makefile.dj2 2009-05-02 07:08:52.252064000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.dj2 2009-06-26 21:36:09.691018000 -0500 @@ -1,8 +1,11 @@ # DJGPP (DOS gcc) makefile for libpng # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # where make install will put libpng.a and png.h #prefix=/usr/local prefix=. diff -ru4NwbB libpng-1.2.37/scripts/makefile.elf libpng-1.2.38rc03/scripts/makefile.elf --- libpng-1.2.37/scripts/makefile.elf 2009-06-04 06:08:02.549888786 -0500 +++ libpng-1.2.38rc03/scripts/makefile.elf 2009-07-11 09:13:59.196605106 -0500 @@ -1,9 +1,12 @@ # makefile for libpng.a and libpng%N%.so on Linux ELF with gcc # Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs # and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Modified for Debian by Junichi Uekawa and Josselin Mouette # Major modifications are: # * link libpng explicitly with libz and libm diff -ru4NwbB libpng-1.2.37/scripts/makefile.freebsd libpng-1.2.38rc03/scripts/makefile.freebsd --- libpng-1.2.37/scripts/makefile.freebsd 2009-06-04 06:08:02.296315405 -0500 +++ libpng-1.2.38rc03/scripts/makefile.freebsd 2009-07-11 09:13:58.497217010 -0500 @@ -1,7 +1,10 @@ # makefile for libpng under FreeBSD # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h PREFIX?= /usr/local SHLIB_VER?= 5 diff -ru4NwbB libpng-1.2.37/scripts/makefile.gcc libpng-1.2.38rc03/scripts/makefile.gcc --- libpng-1.2.37/scripts/makefile.gcc 2009-05-02 07:47:42.552494000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.gcc 2009-06-26 21:36:09.733760000 -0500 @@ -1,9 +1,12 @@ # makefile for libpng using gcc (generic, static library) # Copyright (C) 2008 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Location of the zlib library and include files ZLIBINC = ../zlib ZLIBLIB = ../zlib diff -ru4NwbB libpng-1.2.37/scripts/makefile.gcmmx libpng-1.2.38rc03/scripts/makefile.gcmmx --- libpng-1.2.37/scripts/makefile.gcmmx 2009-06-04 06:08:02.559793669 -0500 +++ libpng-1.2.38rc03/scripts/makefile.gcmmx 2009-07-11 09:13:59.239855511 -0500 @@ -2,9 +2,12 @@ # assembler code # Copyright 2002, 2006, 2008 Greg Roelofs and Glenn Randers-Pehrson # Copyright 1998-2001 Greg Roelofs # Copyright 1996-1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # CAUTION: Do not use this makefile with gcc versions 2.7.2.2 and earlier. # NOTE: When testing MMX performance on a multitasking system, make sure diff -ru4NwbB libpng-1.2.37/scripts/makefile.hp64 libpng-1.2.38rc03/scripts/makefile.hp64 --- libpng-1.2.37/scripts/makefile.hp64 2009-06-04 06:08:02.569407688 -0500 +++ libpng-1.2.38rc03/scripts/makefile.hp64 2009-07-11 09:13:59.278238045 -0500 @@ -1,9 +1,12 @@ # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. # 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 -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib ZLIBINC=/opt/zlib/include diff -ru4NwbB libpng-1.2.37/scripts/makefile.hpgcc libpng-1.2.38rc03/scripts/makefile.hpgcc --- libpng-1.2.37/scripts/makefile.hpgcc 2009-06-04 06:08:02.578932911 -0500 +++ libpng-1.2.38rc03/scripts/makefile.hpgcc 2009-07-11 09:13:59.318582999 -0500 @@ -2,9 +2,12 @@ # Copyright (C) 2002, 2006-2008 Glenn Randers-Pehrson # Copyright (C) 2001, Laurent faillie # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.hpux libpng-1.2.38rc03/scripts/makefile.hpux --- libpng-1.2.37/scripts/makefile.hpux 2009-06-04 06:08:02.589916458 -0500 +++ libpng-1.2.38rc03/scripts/makefile.hpux 2009-07-11 09:13:59.356565572 -0500 @@ -1,9 +1,12 @@ # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. # 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 -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Where the zlib library and include files are located ZLIBLIB=/opt/zlib/lib ZLIBINC=/opt/zlib/include diff -ru4NwbB libpng-1.2.37/scripts/makefile.ibmc libpng-1.2.38rc03/scripts/makefile.ibmc --- libpng-1.2.37/scripts/makefile.ibmc 2009-05-02 07:49:25.491276000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.ibmc 2009-06-26 21:36:09.784403000 -0500 @@ -1,9 +1,13 @@ # Makefile for libpng (static) # IBM C version 3.x for Win32 and OS/2 # Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h + # Notes: # Derived from makefile.std # All modules are compiled in C mode # Tested under Win32, expected to work under OS/2 diff -ru4NwbB libpng-1.2.37/scripts/makefile.intel libpng-1.2.38rc03/scripts/makefile.intel --- libpng-1.2.37/scripts/makefile.intel 2009-05-02 07:55:10.402399000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.intel 2009-06-26 21:36:09.793885000 -0500 @@ -3,9 +3,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. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # To use, do "nmake /f scripts\makefile.intel" # ------------------- Intel C/C++ Compiler 4.0 and later ------------------- diff -ru4NwbB libpng-1.2.37/scripts/makefile.knr libpng-1.2.38rc03/scripts/makefile.knr --- libpng-1.2.37/scripts/makefile.knr 2009-05-02 07:07:06.451133000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.knr 2009-06-26 21:36:09.803195000 -0500 @@ -1,8 +1,11 @@ # makefile for libpng # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license 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 -ru4NwbB libpng-1.2.37/scripts/makefile.linux libpng-1.2.38rc03/scripts/makefile.linux --- libpng-1.2.37/scripts/makefile.linux 2009-06-04 06:08:02.601112009 -0500 +++ libpng-1.2.38rc03/scripts/makefile.linux 2009-07-11 09:13:59.397701186 -0500 @@ -1,9 +1,12 @@ # makefile for libpng.a and libpng%N%.so on Linux ELF with gcc # Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.mingw libpng-1.2.38rc03/scripts/makefile.mingw --- libpng-1.2.37/scripts/makefile.mingw 2009-06-04 06:08:02.612618504 -0500 +++ libpng-1.2.38rc03/scripts/makefile.mingw 2009-07-11 09:13:59.444134361 -0500 @@ -2,15 +2,18 @@ # Builds both dll (with import lib) and static lib versions # 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 -# For conditions of distribution and use, see copyright notice in png.h +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license 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 # command line that points to the top of the directory where your source diff -ru4NwbB libpng-1.2.37/scripts/makefile.mips libpng-1.2.38rc03/scripts/makefile.mips --- libpng-1.2.37/scripts/makefile.mips 2009-05-02 05:29:55.009730000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.mips 2009-06-26 21:36:09.833768000 -0500 @@ -1,8 +1,11 @@ # makefile for libpng # Copyright (C) Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local INCPATH=$(prefix)/include diff -ru4NwbB libpng-1.2.37/scripts/makefile.msc libpng-1.2.38rc03/scripts/makefile.msc --- libpng-1.2.37/scripts/makefile.msc 2009-05-02 06:57:28.494695000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.msc 2009-06-26 21:36:09.843995000 -0500 @@ -1,8 +1,12 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2006, 2009 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license 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 -------- MODEL=L diff -ru4NwbB libpng-1.2.37/scripts/makefile.ne12bsd libpng-1.2.38rc03/scripts/makefile.ne12bsd --- libpng-1.2.37/scripts/makefile.ne12bsd 2009-06-04 06:08:02.622498946 -0500 +++ libpng-1.2.38rc03/scripts/makefile.ne12bsd 2009-07-11 09:13:59.464971265 -0500 @@ -2,9 +2,12 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # You should also run makefile.netbsd LOCALBASE?=/usr/local diff -ru4NwbB libpng-1.2.37/scripts/makefile.netbsd libpng-1.2.38rc03/scripts/makefile.netbsd --- libpng-1.2.37/scripts/makefile.netbsd 2009-06-04 06:08:02.632414364 -0500 +++ libpng-1.2.38rc03/scripts/makefile.netbsd 2009-07-11 09:13:59.485898018 -0500 @@ -2,9 +2,12 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # You should also run makefile.ne0bsd LOCALBASE?=/usr/local diff -ru4NwbB libpng-1.2.37/scripts/makefile.nommx libpng-1.2.38rc03/scripts/makefile.nommx --- libpng-1.2.37/scripts/makefile.nommx 2009-06-04 06:08:02.643705626 -0500 +++ libpng-1.2.38rc03/scripts/makefile.nommx 2009-07-11 09:13:59.526890614 -0500 @@ -1,9 +1,12 @@ # makefile for libpng.a and libpng%N%.so on Linux ELF with gcc # Copyright (C) 1998, 1999, 2002, 2006-2008 Greg Roelofs and # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.openbsd libpng-1.2.38rc03/scripts/makefile.openbsd --- libpng-1.2.37/scripts/makefile.openbsd 2009-06-04 06:08:02.653920507 -0500 +++ libpng-1.2.38rc03/scripts/makefile.openbsd 2009-07-11 09:13:59.552316532 -0500 @@ -1,8 +1,11 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2007-2008 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h PREFIX?= /usr/local LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat diff -ru4NwbB libpng-1.2.37/scripts/makefile.os2 libpng-1.2.38rc03/scripts/makefile.os2 --- libpng-1.2.37/scripts/makefile.os2 2008-08-02 07:23:02.526620000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.os2 2009-06-26 21:36:09.898649000 -0500 @@ -1,6 +1,9 @@ # makefile for libpng on OS/2 with gcc -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Related files: pngos2.def CC=gcc -Zomf -s diff -ru4NwbB libpng-1.2.37/scripts/makefile.sco libpng-1.2.38rc03/scripts/makefile.sco --- libpng-1.2.37/scripts/makefile.sco 2009-06-04 06:08:02.665032810 -0500 +++ libpng-1.2.38rc03/scripts/makefile.sco 2009-07-11 09:13:59.590628780 -0500 @@ -3,9 +3,12 @@ # force ELF build dynamic linking, SONAME setting in lib and RPATH in app # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.sggcc libpng-1.2.38rc03/scripts/makefile.sggcc --- libpng-1.2.37/scripts/makefile.sggcc 2009-06-04 06:08:02.676283246 -0500 +++ libpng-1.2.38rc03/scripts/makefile.sggcc 2009-07-11 09:13:59.629812826 -0500 @@ -1,8 +1,11 @@ # makefile for libpng.a and libpng%N%.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME=libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.sgi libpng-1.2.38rc03/scripts/makefile.sgi --- libpng-1.2.37/scripts/makefile.sgi 2009-06-04 06:08:02.687411613 -0500 +++ libpng-1.2.38rc03/scripts/makefile.sgi 2009-07-11 09:13:59.669406227 -0500 @@ -1,8 +1,11 @@ # makefile for libpng.a and libpng%N%.so, SGI IRIX with 'cc' # Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME=libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.so9 libpng-1.2.38rc03/scripts/makefile.so9 --- libpng-1.2.37/scripts/makefile.so9 2009-06-04 06:08:02.697002713 -0500 +++ libpng-1.2.38rc03/scripts/makefile.so9 2009-07-11 09:13:59.712395227 -0500 @@ -3,9 +3,12 @@ # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson # Copyright (C) 1998-2001 Greg Roelofs # Copyright (C) 1996-1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: PNGMAJ = %SONUM% PNGMIN = 1.2.38rc03 diff -ru4NwbB libpng-1.2.37/scripts/makefile.solaris libpng-1.2.38rc03/scripts/makefile.solaris --- libpng-1.2.37/scripts/makefile.solaris 2009-06-04 06:08:02.708410621 -0500 +++ libpng-1.2.38rc03/scripts/makefile.solaris 2009-07-11 09:13:59.752622178 -0500 @@ -2,9 +2,12 @@ # Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.solaris-x86 libpng-1.2.38rc03/scripts/makefile.solaris-x86 --- libpng-1.2.37/scripts/makefile.solaris-x86 2009-06-04 06:08:02.718227718 -0500 +++ libpng-1.2.38rc03/scripts/makefile.solaris-x86 2009-07-11 09:13:59.793452944 -0500 @@ -2,9 +2,12 @@ # Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng%N% PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.37/scripts/makefile.std libpng-1.2.38rc03/scripts/makefile.std --- libpng-1.2.37/scripts/makefile.std 2009-05-02 05:23:52.763211000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.std 2009-06-26 21:36:09.983907000 -0500 @@ -1,8 +1,11 @@ # makefile for libpng # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local INCPATH=$(prefix)/include diff -ru4NwbB libpng-1.2.37/scripts/makefile.sunos libpng-1.2.38rc03/scripts/makefile.sunos --- libpng-1.2.37/scripts/makefile.sunos 2009-05-02 05:31:09.828282000 -0500 +++ libpng-1.2.38rc03/scripts/makefile.sunos 2009-06-26 21:36:09.994379000 -0500 @@ -1,8 +1,11 @@ # makefile for libpng # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # where make install puts libpng.a and png.h prefix=/usr/local INCPATH=$(prefix)/include diff -ru4NwbB libpng-1.2.37/scripts/makefile.vcawin32 libpng-1.2.38rc03/scripts/makefile.vcawin32 --- libpng-1.2.37/scripts/makefile.vcawin32 2009-06-04 06:08:02.401053237 -0500 +++ libpng-1.2.38rc03/scripts/makefile.vcawin32 2009-07-11 09:13:58.732484298 -0500 @@ -1,8 +1,12 @@ # makefile for libpng # Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license 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" # -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- diff -ru4NwbB libpng-1.2.37/scripts/makefile.vcwin32 libpng-1.2.38rc03/scripts/makefile.vcwin32 --- libpng-1.2.37/scripts/makefile.vcwin32 2009-06-04 06:08:02.409173709 -0500 +++ libpng-1.2.38rc03/scripts/makefile.vcwin32 2009-07-11 09:13:58.749900642 -0500 @@ -1,8 +1,12 @@ # makefile for libpng # Copyright (C) 1998 Tim Wegner # Copyright (C) 2006,2009 Glenn Randers-Pehrson -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license 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" # -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- diff -ru4NwbB libpng-1.2.37/scripts/makefile.watcom libpng-1.2.38rc03/scripts/makefile.watcom --- libpng-1.2.37/scripts/makefile.watcom 2001-01-05 18:26:23.000000000 -0600 +++ libpng-1.2.38rc03/scripts/makefile.watcom 2009-06-26 21:36:10.029602000 -0500 @@ -2,9 +2,12 @@ # Watcom C/C++ 10.0 and later, 32-bit protected mode, flat memory model # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # To use, do "wmake /f scripts\makefile.watcom" diff -ru4NwbB libpng-1.2.37/scripts/smakefile.ppc libpng-1.2.38rc03/scripts/smakefile.ppc --- libpng-1.2.37/scripts/smakefile.ppc 2000-06-03 08:40:57.000000000 -0500 +++ libpng-1.2.38rc03/scripts/smakefile.ppc 2009-06-26 21:36:10.039137000 -0500 @@ -1,8 +1,11 @@ # Amiga powerUP (TM) Makefile # makefile for libpng and SAS C V6.58/7.00 PPC compiler # Copyright (C) 1998 by Andreas R. Kleinert -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h CC = scppc CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \ OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8