diff options
59 files changed, 167 insertions, 125 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.3rc2 - May 1, 2002 +Libpng 1.2.3rc3 - May 1, 2002 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -32,6 +32,9 @@ version 1.2.3rc2 [May 1, 2002] png_default_flush(), and png_push_fill_buffer() and included them in module definition files. Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles. +version 1.2.3rc3 [May 1, 2002] + Revised prototype for png_default_flush() + Remove old libpng.pc and libpngNN.pc before installing new ones. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1097,6 +1097,9 @@ version 1.2.3rc2 [May 1, 2002] png_default_flush(), and png_push_fill_buffer() and included them in module definition files. Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles. +version 1.2.3rc3 [May 1, 2002] + Revised prototype for png_default_flush() + Remove old libpng.pc and libpngNN.pc before installing new ones. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1,5 +1,5 @@ -Installing libpng version 1.2.3rc2 - May 1, 2002 +Installing libpng version 1.2.3rc3 - May 1, 2002 Before installing libpng, you must first install zlib. zlib can usually be found wherever you got libpng. zlib can be @@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.3rc2" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.2.3rc3" or "lpng109" and "zlib-1.1.3" or "zlib113") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -64,8 +64,8 @@ The files that are presently available in the scripts directory include makefile.std => Generic UNIX makefile (cc, creates static libpng.a) - makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc2) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc2, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc3) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.3rc3, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -86,10 +86,10 @@ include makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc3) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.3rc2) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.3rc2) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.3rc3) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.3rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.3rc2 +Known bugs in libpng version 1.2.3rc3 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled. @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.3rc2, May 1, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.3rc3, May 1, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors @@ -1,4 +1,4 @@ -README for libpng 1.2.3rc2 - May 1, 2002 (shared library 2.1) +README for libpng 1.2.3rc3 - May 1, 2002 (shared library 2.1) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -187,9 +187,9 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.3rc2) + (gcc, creates libpng12.so.0.1.2.3rc3) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.3rc2, uses assembler code + libpng12.so.0.1.2.3rc3, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -210,12 +210,12 @@ Files in this distribution: makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc2) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.3rc3) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.3rc2) + (gcc, creates libpng12.so.0.1.2.3rc3) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.3rc2) + (gcc, creates libpng12.so.0.1.2.3rc3) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.3rc2 are Y2K compliant. It is my belief that earlier + upward through 1.2.3rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer @@ -1,5 +1,5 @@ echo " - There is no \"configure\" script for Libpng-1.2.3rc2. Instead, please + There is no \"configure\" script for Libpng-1.2.3rc3. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " @@ -1,6 +1,6 @@ .TH LIBPNG 3 "May 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc3 .SH SYNOPSIS \fI\fB @@ -787,7 +787,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.3rc2 - May 1, 2002 + libpng version 1.2.3rc3 - May 1, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3644,7 +3644,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.3rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.3rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3773,7 +3773,7 @@ the first widely used release: 1.2.2rc1 12 10202 12.so.0.1.2.2rc1 1.0.13 10 10013 10.so.0.1.0.13 1.2.2 12 10202 12.so.0.1.2.2 - 1.2.3rc1 12 10203 12.so.0.1.2.3rc1 + 1.2.3rc1-3 12 10203 12.so.0.1.2.3rc1-3 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3831,7 +3831,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.3rc2 - May 1, 2002: +Libpng version 1.2.3rc3 - May 1, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3848,7 +3848,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.0.7, July 1, 2000, through 1.2.3rc2, May 1, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.3rc3, May 1, 2002, are Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors diff --git a/libpng.txt b/libpng.txt index e2bef87d1..63b2048b1 100644 --- a/libpng.txt +++ b/libpng.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.3rc2 - May 1, 2002 + libpng version 1.2.3rc3 - May 1, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2857,7 +2857,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.3rc2 are Y2K compliant. It is my belief that earlier +upward through 1.2.3rc3 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpngpf.3 b/libpngpf.3 index 3e22c2a9e..3e2f7ce7b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "May 1, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.3rc3 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.2.3rc2 - May 1, 2002 + * libpng version 1.2.3rc3 - May 1, 2002 * Copyright (c) 1998-2002 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.) @@ -13,14 +13,14 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_3rc2 Your_png_h_is_not_version_1_2_3rc2; +typedef version_1_2_3rc3 Your_png_h_is_not_version_1_2_3rc3; /* Version information for C files. This had better match the version * string defined in png.h. */ #ifdef PNG_USE_GLOBAL_ARRAYS /* png_libpng_ver was changed to a function in version 1.0.5c */ -const char png_libpng_ver[18] = "1.2.3rc2"; +const char png_libpng_ver[18] = "1.2.3rc3"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -663,7 +663,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (png_ptr != NULL || png_ptr == NULL) /* silence compiler warning */ - return ((png_charp) "\n libpng version 1.2.3rc2 - May 1, 2002\n\ + return ((png_charp) "\n libpng version 1.2.3rc3 - May 1, 2002\n\ Copyright (c) 1998-2002 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -681,8 +681,8 @@ png_get_libpng_ver(png_structp png_ptr) { /* Version of *.c files used when building libpng */ if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return((png_charp) "1.2.3rc2"); - return((png_charp) "1.2.3rc2"); + return((png_charp) "1.2.3rc3"); + return((png_charp) "1.2.3rc3"); } png_charp PNGAPI @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.3rc2 - May 1, 2002 + * libpng version 1.2.3rc3 - May 1, 2002 * Copyright (c) 1998-2002 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.) @@ -8,7 +8,7 @@ * 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.3rc2 - May 1, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.3rc3 - May 1, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -86,7 +86,7 @@ * 1.2.2rc1 12 10202 12.so.0.1.2.2rc1 * 1.0.13 10 10013 10.so.0.1.0.13 * 1.2.2 12 10202 12.so.0.1.2.2 - * 1.2.3rc1 12 10203 12.so.0.1.2.3rc1 + * 1.2.3rc1-3 12 10203 12.so.0.1.2.3rc1-3 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -116,8 +116,8 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.3rc2, May 1, 2002, are - * Copyright (c) 2000-2001 Glenn Randers-Pehrson, and are + * libpng versions 1.0.7, July 1, 2000, through 1.2.3rc3, May 1, 2002, are + * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors * @@ -227,7 +227,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.3rc2 are Y2K compliant. It is my belief that earlier + * upward through 1.2.3rc3 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -283,7 +283,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.3rc2" +#define PNG_LIBPNG_VER_STRING "1.2.3rc3" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -295,7 +295,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 2 +#define PNG_LIBPNG_VER_BUILD 3 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1263,9 +1263,9 @@ struct png_struct_def /* This prevents a compiler error in png.c if png.c and png.h are both at - version 1.2.3rc2 + version 1.2.3rc3 */ -typedef png_structp version_1_2_3rc2; +typedef png_structp version_1_2_3rc3; typedef png_struct FAR * FAR * png_structpp; @@ -1739,6 +1739,12 @@ extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr, extern PNG_EXPORT(void,png_default_write_data) PNGARG((png_structp png_ptr, png_bytep data, png_size_t length)); +#if defined(PNG_WRITE_FLUSH_SUPPORTED) +#if !defined(PNG_NO_STDIO) +PNG_EXPORT(void,png_default_flush) PNGARG((png_structp png_ptr)); +#endif +#endif + /* Replace the default data input function with a user supplied one. */ extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn)); @@ -2405,7 +2411,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */ #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.3rc2 - May 1, 2002 (header)\n" + " libpng version 1.2.3rc3 - May 1, 2002 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on @@ -2712,11 +2718,9 @@ PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr, #if defined(PNG_WRITE_FLUSH_SUPPORTED) PNG_EXTERN void png_flush PNGARG((png_structp png_ptr)); -#if !defined(PNG_NO_STDIO) -PNG_EXTERN void png_default_flush PNGARG((png_structp png_ptr)); -#endif #endif + /* Place a 32-bit number into a buffer in PNG byte order (big-endian). * The only currently known PNG chunks that use signed numbers are * the ancillary extension chunks, oFFs and pCAL. diff --git a/pngasmrd.h b/pngasmrd.h index a71b97339..6891badf7 100644 --- a/pngasmrd.h +++ b/pngasmrd.h @@ -1,6 +1,6 @@ /* pngasmrd.h - assembler version of utilities to read a PNG file * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 2002 Glenn Randers-Pehrson * @@ -1,6 +1,6 @@ /* pngconf.h - machine configurable file for libpng * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index bcdf0d7cd..5ab7cca4e 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index 178e6987c..8eff39ba0 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -6,7 +6,7 @@ * and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm * for Intel's performance analysis of the MMX vs. non-MMX code. * - * libpng version 1.2.3rc2 - May 1, 2002 + * libpng version 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 53838f308..dab441184 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -795,7 +795,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) * not called png_set_interlace_handling(), the display_row buffer will * be ignored, so pass NULL to it. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc3 */ void PNGAPI @@ -844,7 +844,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row, * only call this function once. If you desire to have an image for * each pass of a interlaced image, use png_read_rows() instead. * - * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc2 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.3rc3 */ void PNGAPI png_read_image(png_structp png_ptr, png_bytepp image) @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 0eae7eb62..605574fce 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 1213b8ef2..14b8f82da 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1512,4 +1512,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_3rc2 your_png_h_is_not_version_1_2_3rc2; +typedef version_1_2_3rc3 your_png_h_is_not_version_1_2_3rc3; diff --git a/pngtrans.c b/pngtrans.c index 1e0efda6f..f933e427d 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -2,7 +2,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * libpng version 1.2.3rc2 - May 1, 2002 + * libpng version 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwrite.c b/pngwrite.c index bc84871c5..20a418832 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwtran.c b/pngwtran.c index b64047e7a..750250e27 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngwutil.c b/pngwutil.c index 5edf7aac8..d9489bb14 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.3rc2 - May 1, 2002 + * libpng 1.2.3rc3 - May 1, 2002 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/msvc/README.txt b/projects/msvc/README.txt index 689309b83..a64a2b218 100644 --- a/projects/msvc/README.txt +++ b/projects/msvc/README.txt @@ -1,5 +1,5 @@ Microsoft Developer Studio Build File, Format Version 6.00 for -libpng 1.2.3rc2 (May 1, 2002) and zlib +libpng 1.2.3rc3 (May 1, 2002) and zlib Copyright (C) 2000 Simon-Pierre Cadieux For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/msvc/png32ms.def b/projects/msvc/png32ms.def index 1d784daa3..6223214e3 100644 --- a/projects/msvc/png32ms.def +++ b/projects/msvc/png32ms.def @@ -6,7 +6,7 @@ LIBRARY DESCRIPTION "PNG image compression library for Windows" EXPORTS -;Version 1.2.3rc2 +;Version 1.2.3rc3 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index 0a6bb4ac4..f5c01c1b6 100644 --- a/projects/netware.txt +++ b/projects/netware.txt @@ -1,6 +1,6 @@ A set of project files is available for Netware. Get -libpng-1.2.3rc2-project-netware.zip from a libpng distribution +libpng-1.2.3rc3-project-netware.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.3rc2-project-netware.zip" +"unzip -a libpng-1.2.3rc3-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 9ad27f6a6..bc94d9544 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.3rc2-project-wince.zip from a libpng distribution +libpng-1.2.3rc3-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.3rc2-project-wince.zip" +"unzip -a libpng-1.2.3rc3-project-wince.zip" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ab67d45de..57e918934 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -6,6 +6,6 @@ includedir=${exec_prefix}/include Name: libpng12 Description: Loads and saves PNG files -Version: 1.2.3rc2 +Version: 1.2.3rc3 Libs: -L${libdir} -lpng12 Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index e86a8dc86..e0237499f 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -133,7 +133,9 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ - mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + mkdir $(DESTDIR)$(LIBPATH)/pkgconfig + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 42288a06a..43ec1d755 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -127,13 +127,15 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH) chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER) (cd $(DESTDIR)$(LIBPATH); \ - ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ + ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 58ca15543..4cbe899aa 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -19,7 +19,7 @@ RM = rm -f # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 594be28c8..05a49fe13 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -14,7 +14,7 @@ ZLIBINC=/usr/local/include # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -123,6 +123,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index a52329e35..2a3dbee9f 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -52,7 +52,7 @@ CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ LIBNAME=libpng12 PNGMAJ = 0 PNGDLL = 12 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(PNGDLL).dll @@ -162,6 +162,8 @@ install-shared: $(SHAREDLIB) libpng.pc install-headers install-man -@if [ ! -d $(DESTDIR)$(BINPATH) ]; then mkdir -p $(DESTDIR)$(BINPATH); fi -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir -p $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc install -m 644 $(IMPLIB) $(DESTDIR)$(LIBPATH)/$(LIBNAME).dll.a -@rm -f $(DESTDIR)$(LIBPATH)/$(IMPLIB) (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).dll.a $(IMPLIB)) diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b15eafa75..961606481 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -25,7 +25,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -115,6 +115,8 @@ install-shared: install-headers $(LIBNAME).dylib libpng.pc ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.dec b/scripts/makefile.dec index cc19e9a62..753e23993 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -28,7 +28,7 @@ ZLIBINC=../zlib # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -102,6 +102,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 963a43afa..63f58459a 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -161,6 +161,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0ec23cd80..eac0677aa 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -35,7 +35,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -126,6 +126,8 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \ $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0b0534b2a..db19154cb 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -19,7 +19,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -111,6 +111,8 @@ install-shared: install-headers $(LIBNAME).sl.$(PNGVER) libpng.pc ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8480888dd..285a03a66 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -135,6 +135,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \ $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 8bd87d296..a2ce05507 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -17,7 +17,7 @@ ZLIBINC=../zlib CC=cc PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 @@ -105,15 +105,17 @@ install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) libpng libpng.3.$(SHARED_POSTFIX); \ ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) \ libpng.3.$(PNGMIN).$(SHARED_POSTFIX); \ - ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ + ln -f -s $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \ - ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \ + ln -f -s $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(SHAREDLIB_POSTFIX)) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc - (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) + (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f901d460d..f6dac300d 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.3rc2 +SHLIB_MINOR= 1.2.3rc3 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index be41cd747..151f11cea 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.3rc2 +SHLIB_MINOR= 1.2.3rc3 SRCS= pnggccrd.c png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index ddfb415ea..829c13c84 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.3rc2 +SHLIB_MINOR= 1.2.3rc3 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index d1e971b6f..f897bc189 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -26,7 +26,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -119,6 +119,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b427b6ce4..96a0f342d 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -36,7 +36,7 @@ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=CC $(ABI) -shared PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) # See "man dso" for info about shared objects LIBS=libpng12.so.$(PNGVER) @@ -74,8 +74,8 @@ libpng.pc: $(LIBNAME).so.$(PNGVER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) - ln -s $@ $(LIBNAME).so - ln -s $@ $(LIBNAME).so.$(PNGMAJ) + ln -s -f $@ $(LIBNAME).so + ln -s -f $@ $(LIBNAME).so.$(PNGMAJ) pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -93,15 +93,15 @@ install-headers: png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng - (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \ - ln -f -s $(LIBNAME)/* .) + (cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; \ + ln -sf $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a - (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a) + (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi @@ -113,16 +113,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH) chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER) (cd $(DESTDIR)$(LIBPATH); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc - (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) + (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 1801e77f2..1f1fbd935 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -31,7 +31,7 @@ LDSHARED=cc $(ABI) -shared # See "man dso" for info about shared objects LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) RANLIB=echo @@ -70,8 +70,8 @@ libpng.a: $(OBJS) $(LIBNAME).so.$(PNGVER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ) - ln -s $@ $(LIBNAME).so - ln -s $@ $(LIBNAME).so.$(PNGMAJ) + ln -s -f $@ $(LIBNAME).so + ln -s -f $@ $(LIBNAME).so.$(PNGMAJ) pngtest: pngtest.o libpng.a $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -88,15 +88,15 @@ install-headers: png.h pngconf.h $(DESTDIR)$(INCPATH)/$(LIBNAME)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/png.h $(DESTDIR)$(INCPATH)/pngconf.h -@/bin/rm -f $(DESTDIR)$(INCPATH)/libpng - (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \ - ln -f -s $(LIBNAME)/* .) + (cd $(DESTDIR)$(INCPATH); ln -sf $(LIBNAME) libpng; \ + ln -sf $(LIBNAME)/* .) install-static: install-headers libpng.a -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi cp libpng.a $(DESTDIR)$(LIBPATH)/$(LIBNAME).a chmod 644 $(DESTDIR)$(LIBPATH)/$(LIBNAME).a -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libpng.a - (cd $(DESTDIR)$(LIBPATH); ln -f -s $(LIBNAME).a libpng.a) + (cd $(DESTDIR)$(LIBPATH); ln -sf $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc -@if [ ! -d $(DESTDIR)$(LIBPATH) ]; then mkdir $(DESTDIR)$(LIBPATH); fi @@ -108,16 +108,18 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc cp $(LIBNAME).so.$(PNGVER) $(DESTDIR)$(LIBPATH) chmod 755 $(DESTDIR)$(LIBPATH)/$(LIBNAME).so.$(PNGVER) (cd $(DESTDIR)$(LIBPATH); \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \ - ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ - ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ - ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \ + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \ + ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ + ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc - (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) + (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -sf libpng12.pc libpng.pc) install-man: libpng.3 libpngpf.3 png.5 -@if [ ! -d $(MANPATH) ]; then mkdir $(MANPATH); fi diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index bef6988db..f97788e58 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -36,7 +36,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -138,6 +138,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then mkdir \ $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 9ed087641..88b42474e 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -32,7 +32,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 0. You should not # have to change it. PNGMAJ = 0 -PNGMIN = 1.2.3rc2 +PNGMIN = 1.2.3rc3 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -134,6 +134,8 @@ install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)) -@if [ ! -d $(DESTDIR)$(LIBPATH)/pkgconfig ]; then \ mkdir $(DESTDIR)$(LIBPATH)/pkgconfig; fi + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.12.pc + -@/bin/rm -f $(DESTDIR)$(LIBPATH)/pkgconfig/libpng.pc cp libpng.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc chmod 644 $(DESTDIR)$(LIBPATH)/pkgconfig/libpng12.pc (cd $(DESTDIR)$(LIBPATH)/pkgconfig; ln -f -s libpng12.pc libpng.pc) diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index d86b2af15..7851a0e73 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.3rc2'; + PNG_LIBPNG_VER_STRING = '1.2.3rc3'; PNG_LIBPNG_VER = 10203; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 3ce9bfa54..b2a29d651 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.3rc2 +; Version 1.2.3rc3 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |