diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-03-08 01:31:27 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:06:49 -0500 |
| commit | 377657d1d63d62aca585f1b10b5822767008a214 (patch) | |
| tree | 7a1af307d2ed7deed51ccd3b30424b93625f9e2a | |
| parent | c1bfe686ce0bafc1572ed2978b3df7671d40d0b8 (diff) | |
| download | libpng-1.2.2beta4.tar.gz | |
Imported from libpng-1.2.2beta4.tarv1.2.2beta4
65 files changed, 231 insertions, 150 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.2beta3 - March 7, 2002 +Libpng 1.2.2beta4 - March 8, 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. @@ -30,6 +30,11 @@ version 1.2.2beta3 [March 7, 2002] Added install-shared target to all makefiles that make shared libraries. Stopped a double free of palette, hist, and trans when not using free_me. Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64. +version 1.2.2beta4 [March 8, 2002] + Compute background.gray and background_1.gray even when color_type is RGB + in case image gets reduced to gray later. + Relocated a misplaced /bin/rm in the "install-shared" makefile targets + Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1031,6 +1031,8 @@ version 1.2.2beta2 [February 23, 2002] Added install-static to all makefiles that make shared libraries. Always do gamma compensation when image is partially transparent. version 1.2.2beta3 [March 7, 2002] + Compute background.gray and background_1.gray even when color_type is RGB + in case image gets reduced to gray later. Modified shared-library makefiles to install pkgconfig/libpngNN.pc. Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown Removed unused png_write_destroy_info prototype from png.h @@ -1038,6 +1040,11 @@ version 1.2.2beta3 [March 7, 2002] Added install-shared target to all makefiles that make shared libraries. Stopped a double free of palette, hist, and trans when not using free_me. Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64. +version 1.2.2beta4 [March 8, 2002] + Compute background.gray and background_1.gray even when color_type is RGB + in case image gets reduced to gray later. + Relocated a misplaced /bin/rm in the "install-shared" makefile targets + Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library. 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.2beta3 - March 7, 2002 +Installing libpng version 1.2.2beta4 - March 8, 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.2beta3" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.2.2beta4" 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.2beta3) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta3, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta4) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta4, 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 @@ -84,10 +84,10 @@ include makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD 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.2beta3) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta4) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2beta3) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2beta3) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2beta4) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2beta4) 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.2beta3 +Known bugs in libpng version 1.2.2beta4 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.2beta3, March 7, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.2beta4, March 8, 2002, are Copyright (c) 2000 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 @@ -99,4 +99,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -March 7, 2002 +March 8, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.2beta3 - March 7, 2002 (shared library 2.1) +README for libpng 1.2.2beta4 - March 8, 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.2beta3) + (gcc, creates libpng12.so.0.1.2.2beta4) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.2beta3, uses assembler code + libpng12.so.0.1.2.2beta4, 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 @@ -208,12 +208,12 @@ Files in this distribution: makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) - makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta3) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2beta4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.2beta3) + (gcc, creates libpng12.so.0.1.2.2beta4) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.2beta3) + (gcc, creates libpng12.so.0.1.2.2beta4) 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,13 +1,13 @@ Y2K compliance in libpng: ========================= - March 7, 2002 + March 8, 2002 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.2beta3 are Y2K compliant. It is my belief that earlier + upward through 1.2.2beta4 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.2beta3. Instead, please + There is no \"configure\" script for Libpng-1.2.2beta4. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/contrib/gregbook/Makefile.sgi b/contrib/gregbook/Makefile.sgi index bba61fbf8..5c8ca6be9 100644 --- a/contrib/gregbook/Makefile.sgi +++ b/contrib/gregbook/Makefile.sgi @@ -1,6 +1,6 @@ # Sample makefile for rpng-x / rpng2-x / wpng for SGI using cc and make. # Greg Roelofs -# Last modified: 16 January 1000 +# Last modified: 7 March 2002 # # The programs built by this makefile are described in the book, # "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and @@ -23,9 +23,9 @@ # macros -------------------------------------------------------------------- -PNGINC = -I/usr/local/include -PNGLIB = -L/usr/local/lib -lpng # dynamically linked against libpng -#PNGLIB = /usr/local/lib/libpng.a # statically linked against libpng +PNGINC = -I/usr/local/include/libpng12 +PNGLIB = -L/usr/local/lib -lpng12 # dynamically linked against libpng +#PNGLIB = /usr/local/lib/libpng12.a # statically linked against libpng # or: #PNGINC = -I../.. #PNGLIB = -L../.. -lpng diff --git a/contrib/gregbook/Makefile.unx b/contrib/gregbook/Makefile.unx index 3efe08535..c0c3fb1c3 100644 --- a/contrib/gregbook/Makefile.unx +++ b/contrib/gregbook/Makefile.unx @@ -1,6 +1,6 @@ # Sample makefile for rpng-x / rpng2-x / wpng using gcc and make. # Greg Roelofs -# Last modified: 7 February 2001 +# Last modified: 7 March 2002 # # The programs built by this makefile are described in the book, # "PNG: The Definitive Guide," by Greg Roelofs (O'Reilly and @@ -23,9 +23,9 @@ # macros -------------------------------------------------------------------- -PNGINC = -I/usr/local/include -#PNGLIB = -L/usr/local/lib -lpng # dynamically linked against libpng -PNGLIB = /usr/local/lib/libpng.a # statically linked against libpng +PNGINC = -I/usr/local/include/libpng12 +#PNGLIB = -L/usr/local/lib -lpng12 # dynamically linked against libpng +PNGLIB = /usr/local/lib/libpng12.a # statically linked against libpng # or: #PNGINC = -I../libpng #PNGLIB = -L../libpng -lpng diff --git a/contrib/gregbook/toucan.png b/contrib/gregbook/toucan.png Binary files differindex 03960d493..26c932b94 100644 --- a/contrib/gregbook/toucan.png +++ b/contrib/gregbook/toucan.png diff --git a/contrib/pngminus/makefile.std b/contrib/pngminus/makefile.std index 074047d6f..2fb061bbe 100644 --- a/contrib/pngminus/makefile.std +++ b/contrib/pngminus/makefile.std @@ -8,9 +8,9 @@ LD=$(CC) RM=rm -f #PNGPATH = /usr/local -#PNGINC = -I$(PNGPATH)/include -#PNGLIB = -L$(PNGPATH)/lib -lpng -#PNGLIBS = $(PNGPATH)/lib/libpng.a +#PNGINC = -I$(PNGPATH)/include/libpng12 +#PNGLIB = -L$(PNGPATH)/lib -lpng12 +#PNGLIBS = $(PNGPATH)/lib/libpng12.a PNGINC = -I../.. PNGLIB = -L../.. -lpng PNGLIBS = ../../libpng.a diff --git a/contrib/pngminus/png2pnm.sh b/contrib/pngminus/png2pnm.sh index 854313bad..854313bad 100755..100644 --- a/contrib/pngminus/png2pnm.sh +++ b/contrib/pngminus/png2pnm.sh diff --git a/contrib/pngminus/pngminus.sh b/contrib/pngminus/pngminus.sh index 6b2d8c5e4..6b2d8c5e4 100755..100644 --- a/contrib/pngminus/pngminus.sh +++ b/contrib/pngminus/pngminus.sh diff --git a/contrib/pngminus/pnm2png.sh b/contrib/pngminus/pnm2png.sh index 5afda9fb9..5afda9fb9 100755..100644 --- a/contrib/pngminus/pnm2png.sh +++ b/contrib/pngminus/pnm2png.sh @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 7, 2002" +.TH LIBPNG 3 "March 8, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta4 .SH SYNOPSIS \fI\fB @@ -795,7 +795,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.2beta3 - March 7, 2002 + libpng version 1.2.2beta4 - March 8, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -3643,13 +3643,13 @@ application: .SH IX. Y2K Compliance in libpng -March 7, 2002 +March 8, 2002 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.2beta3 are Y2K compliant. It is my belief that earlier +upward through 1.2.2beta4 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 @@ -3772,7 +3772,7 @@ the first widely used release: 1.2.1beta-4 3 10201 3.1.2.1beta1-4 1.2.1rc1-2 3 10201 3.1.2.1rc1-2 1.2.1 3 10201 3.1.2.1 - 1.2.2beta1-3 12 10202 12.so.0.1.2.2beta1-3 + 1.2.2beta1-4 12 10202 12.so.0.1.2.2beta1-4 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3830,7 +3830,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.2beta3 - March 7, 2002: +Libpng version 1.2.2beta4 - March 8, 2002: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu). @@ -3847,7 +3847,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.2beta3, March 7, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.2beta4, March 8, 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 @@ -3939,7 +3939,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -March 7, 2002 +March 8, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index 0dc0b09ae..5fbe46e2a 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.2beta3 - March 7, 2002 + libpng version 1.2.2beta4 - March 8, 2002 Updated and distributed by Glenn Randers-Pehrson <randeg@alum.rpi.edu> Copyright (c) 1998-2002 Glenn Randers-Pehrson @@ -2848,13 +2848,13 @@ application: IX. Y2K Compliance in libpng -March 7, 2002 +March 8, 2002 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.2beta3 are Y2K compliant. It is my belief that earlier +upward through 1.2.2beta4 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 52363d2a7..a0afd44fd 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 7, 2002" +.TH LIBPNGPF 3 "March 8, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta4 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 7, 2002" +.TH PNG 5 "March 8, 2002" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * libpng version 1.2.2beta3 - March 7, 2002 + * libpng version 1.2.2beta4 - March 8, 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_2beta3 Your_png_h_is_not_version_1_2_2beta3; +typedef version_1_2_2beta4 Your_png_h_is_not_version_1_2_2beta4; /* 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.2beta3"; +const char png_libpng_ver[18] = "1.2.2beta4"; /* png_sig was changed to a function in version 1.0.5c */ /* Place to hold the signature string for a PNG file. */ @@ -660,7 +660,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.2beta3 - March 7, 2002\n\ + return ((png_charp) "\n libpng version 1.2.2beta4 - March 8, 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"); @@ -678,8 +678,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.2beta3"); - return((png_charp) "1.2.2beta3"); + return((png_charp) "1.2.2beta4"); + return((png_charp) "1.2.2beta4"); } png_charp PNGAPI @@ -739,6 +739,7 @@ png_access_version_number(void) void /* PRIVATE */ png_init_mmx_flags (png_structp png_ptr) { +#if !defined(PNG_1_0_X) png_ptr->mmx_rowbytes_threshold = 0; png_ptr->mmx_bitdepth_threshold = 0; @@ -777,6 +778,7 @@ png_init_mmx_flags (png_structp png_ptr) png_ptr->asm_flags &= ~( PNG_MMX_FLAGS ); # endif /* ?(PNGVCRD || PNGGCCRD) */ +#endif /* PNG_1_0_X */ } #endif /* !(PNG_ASSEMBLER_CODE_SUPPORTED) */ @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.2beta3 - March 7, 2002 + * libpng version 1.2.2beta4 - March 8, 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.) @@ -9,7 +9,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.2beta3 - March 7, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.2beta4 - March 8, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -81,7 +81,7 @@ * 1.2.1beta1-4 3 10201 3.1.2.1beta1-4 * 1.2.1rc1-2 3 10201 3.1.2.1rc1-2 * 1.2.1 3 10201 3.1.2.1 - * 1.2.2beta1-3 12 10202 12.so.0.1.2.2beta1-3 + * 1.2.2beta1-4 12 10202 12.so.0.1.2.2beta1-4 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -111,7 +111,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.2beta3, March 7, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.2beta4, March 8, 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 @@ -216,13 +216,13 @@ * Y2K compliance in libpng: * ========================= * - * March 7, 2002 + * March 8, 2002 * * 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.2beta3 are Y2K compliant. It is my belief that earlier + * upward through 1.2.2beta4 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 @@ -278,7 +278,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.2beta3" +#define PNG_LIBPNG_VER_STRING "1.2.2beta4" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -290,7 +290,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 3 +#define PNG_LIBPNG_VER_BUILD 4 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -1216,7 +1216,11 @@ struct png_struct_def defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \ defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED) /* changed from png_byte to png_uint_32 at version 1.2.0 */ +#ifdef PNG_1_0_X + png_byte mng_features_permitted; +#else png_uint_32 mng_features_permitted; +#endif /* PNG_1_0_X */ #endif /* New member added in libpng-1.0.7 */ @@ -1229,13 +1233,13 @@ struct png_struct_def png_byte filter_type; #endif -#if defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD) +#if defined(PNG_1_0_X) || (defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD)) /* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */ png_uint_32 row_buf_size; #endif /* New members added in libpng-1.2.0 */ -#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) +#if !defined(PNG_1_0_X) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) png_byte mmx_bitdepth_threshold; png_uint_32 mmx_rowbytes_threshold; png_uint_32 asm_flags; @@ -1254,9 +1258,9 @@ struct png_struct_def /* This prevents a compiler error in png_get_copyright() in png.c if png.c - and png.h are both at version 1.2.2beta3 + and png.h are both at version 1.2.2beta4 */ -typedef png_structp version_1_2_2beta3; +typedef png_structp version_1_2_2beta4; typedef png_struct FAR * FAR * png_structpp; @@ -2337,6 +2341,7 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp #define PNG_SELECT_WRITE 2 +#if !defined(PNG_1_0_X) /* pngget.c */ extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask) PNGARG((int flag_select, int *compilerID)); @@ -2366,6 +2371,7 @@ extern PNG_EXPORT(void,png_set_mmx_thresholds) PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold, png_uint_32 mmx_rowbytes_threshold)); +#endif /* PNG_1_0_X */ #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ /* png.c, pnggccrd.c, or pngvcrd.c */ @@ -2381,7 +2387,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.2beta3 - March 7, 2002 (header)\n" + " libpng version 1.2.2beta4 - March 8, 2002 (header)\n" #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED /* With these routines we avoid an integer divide, which will be slower on diff --git a/pngasmrd.h b/pngasmrd.h index 62ec1fba0..cf5b9604f 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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) @@ -47,7 +47,7 @@ /* Enabled by default in 1.2.0. You can disable this if you don't need to support PNGs that are embedded in MNG datastreams */ -#ifndef PNG_NO_MNG_FEATURES +#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES) # ifndef PNG_MNG_FEATURES_SUPPORTED # define PNG_MNG_FEATURES_SUPPORTED # endif @@ -647,9 +647,11 @@ #define PNG_THREAD_UNSAFE_OK */ +#if !defined(PNG_1_0_X) #if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED) # define PNG_USER_MEM_SUPPORTED #endif +#endif /* PNG_1_0_X */ /* These are currently experimental features, define them if you want */ diff --git a/pngerror.c b/pngerror.c index cf2d1d319..2b7d26231 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 cd109d28b..ab58b57f8 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.2beta3 - March 7, 2002 + * libpng version 1.2.2beta4 - March 8, 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 @@ -600,8 +600,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_bytep dstptr; #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { png_uint_32 len; int diff; @@ -734,8 +738,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_bytep dstptr; #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { png_uint_32 len; int diff; @@ -883,8 +891,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_bytep dstptr; #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { png_uint_32 len; int diff; @@ -1047,8 +1059,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_bytep dstptr; #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { png_uint_32 len; int diff; @@ -1218,8 +1234,12 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask) png_bytep dstptr; #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { png_uint_32 len; int diff; @@ -1694,8 +1714,12 @@ png_do_read_interlace(png_structp png_ptr) /* New code by Nirav Chhatrapati - Intel Corporation */ #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE) /* && _mmx_supported */ ) +#else + if (_mmx_supported) +#endif { //-------------------------------------------------------------- if (pixel_bytes == 3) @@ -5056,26 +5080,34 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep break; case 1: sprintf(filnm, "sub-%s", #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "MMX" : #endif +#endif "x86"); break; case 2: sprintf(filnm, "up-%s", #ifdef PNG_ASSEMBLER_CODE_SUPPORTED +#if !defined(PNG_1_0_X) (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "MMX" : #endif +#endif "x86"); break; case 3: sprintf(filnm, "avg-%s", #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "MMX" : #endif +#endif "x86"); break; case 4: sprintf(filnm, "Paeth-%s", #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "MMX": #endif +#endif "x86"); break; default: sprintf(filnm, "unknw"); @@ -5095,7 +5127,11 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep case PNG_FILTER_VALUE_SUB: #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) && +#else + if ( +#endif (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) { @@ -5120,7 +5156,11 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep case PNG_FILTER_VALUE_UP: #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) && +#else + if ( +#endif (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) { @@ -5144,7 +5184,11 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep case PNG_FILTER_VALUE_AVG: #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) && +#else + if ( +#endif (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) { @@ -5178,7 +5222,11 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep case PNG_FILTER_VALUE_PAETH: #if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK) +#if !defined(PNG_1_0_X) if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) && +#else + if ( +#endif (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) { @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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) @@ -831,6 +831,7 @@ png_get_compression_buffer_size(png_structp png_ptr) } +#ifndef PNG_1_0_X #ifdef PNG_ASSEMBLER_CODE_SUPPORTED /* this function was added to libpng 1.2.0 and should exist by default*/ png_uint_32 PNGAPI @@ -919,3 +920,4 @@ png_get_mmx_rowbytes_threshold (png_structp png_ptr) return (png_uint_32)(png_ptr? png_ptr->mmx_rowbytes_threshold : 0L); } #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ +#endif /* PNG_1_0_X */ @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 2c6e03027..063c58b09 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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) @@ -774,7 +774,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.2beta3 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2beta4 */ void PNGAPI @@ -823,7 +823,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.2beta3 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2beta4 */ 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 4b76c1806..136f8d6d2 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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) @@ -897,6 +897,11 @@ png_init_read_transformations(png_structp png_ptr) break; } + png_ptr->background_1.gray = (png_uint_16)(pow( + (double)png_ptr->background.gray / m, g) * m + .5); + png_ptr->background.gray = (png_uint_16)(pow( + (double)png_ptr->background.gray / m, gs) * m + .5); + if (color_type & PNG_COLOR_MASK_COLOR) { /* RGB or RGBA */ @@ -916,10 +921,12 @@ png_init_read_transformations(png_structp png_ptr) else { /* GRAY or GRAY ALPHA */ - png_ptr->background_1.gray = (png_uint_16)(pow( - (double)png_ptr->background.gray / m, g) * m + .5); - png_ptr->background.gray = (png_uint_16)(pow( - (double)png_ptr->background.gray / m, gs) * m + .5); + png_ptr->background_1.red = png_ptr->background_1.gray; + png_ptr->background_1.green = png_ptr->background_1.gray; + png_ptr->background_1.blue = png_ptr->background_1.gray; + png_ptr->background.red = png_ptr->background.gray; + png_ptr->background.green = png_ptr->background.gray; + png_ptr->background.blue = png_ptr->background.gray; } } } diff --git a/pngrutil.c b/pngrutil.c index 01d489b8c..8bedf394d 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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) @@ -1042,6 +1042,7 @@ png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask) } +#ifndef PNG_1_0_X #ifdef PNG_ASSEMBLER_CODE_SUPPORTED /* this function was added to libpng 1.2.0 and should always exist by default */ void PNGAPI @@ -1096,3 +1097,4 @@ png_set_mmx_thresholds (png_structp png_ptr, png_ptr->mmx_rowbytes_threshold = mmx_rowbytes_threshold; } #endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */ +#endif /* ?PNG_1_0_X */ @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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_2beta3 your_png_h_is_not_version_1_2_2beta3; +typedef version_1_2_2beta4 your_png_h_is_not_version_1_2_2beta4; diff --git a/pngtrans.c b/pngtrans.c index 7afc998c4..a39ea2e4c 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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.2beta3 - March 7, 2002 + * libpng version 1.2.2beta4 - March 8, 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 bb921104e..9fc29544c 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 c285b94db..299138484 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.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 66b34eec9..12fc13b9c 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.2beta3 - March 7, 2002 + * libpng 1.2.2beta4 - March 8, 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 1d1199e23..cae76cbe6 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.2beta3 (March 7, 2002) and zlib +libpng 1.2.2beta4 (March 8, 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 a1c9d2532..62726a1c8 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.2beta3 +;Version 1.2.2beta4 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index db933986a..d5001bbc6 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.2beta3-project-netware.zip from a libpng distribution +libpng-1.2.2beta4-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.2beta3-project-netware.zip" +"unzip -a libpng-1.2.2beta4-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 23e2cf6a3..7fa5bd398 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.2beta3-project-wince.zip from a libpng distribution +libpng-1.2.2beta4-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.2beta3-project-wince.zip" +"unzip -a libpng-1.2.2beta4-project-wince.zip" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 82c4f664f..bca591928 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.2beta3 +Version: 1.2.2beta4 Libs: -L$(libdir) -lpng12 Cflags: -I$(includedir)/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index cf6bcdd90..1d741b8ef 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -103,10 +103,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index a89cbaf2b..91483f488 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -103,10 +103,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 6f6835d02..358f5e328 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -18,7 +18,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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 46cba9f27..fcb1b5bc4 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= @@ -92,10 +92,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 46c326f81..88db662f4 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -39,7 +39,7 @@ CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ # have to change it. PNGMAJ = 0 #PNGDLL = $12 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGMIN_BASE = 1.2.2 PNGVER = $(PNGMAJ).$(PNGMIN) diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d10934915..dc482f71a 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -87,11 +87,11 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).dylib -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3*.dylib - cp $(LIBNAME).$(PNGVER).dylib $(LIBPATH) - chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).dylib -@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.dylib -@/bin/rm -f $(LIBPATH)/$(LIBNAME).dylib - (cd $(LIBPATH); + cp $(LIBNAME).$(PNGVER).dylib $(LIBPATH) + chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).dylib + (cd $(LIBPATH); \ ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.dec b/scripts/makefile.dec index fe7bc2034..1e5d77b85 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -17,7 +17,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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -72,10 +72,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 3a947aeee..496b3968f 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -131,10 +131,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 504a14fd4..e1008f11e 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -95,10 +95,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).sl.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.sl.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl cp $(LIBNAME).sl.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).sl.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index de0e4da55..cdb7d1051 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -81,10 +81,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).sl.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.sl.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl cp $(LIBNAME).sl.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).sl.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).sl.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).sl - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.linux b/scripts/makefile.linux index f7f582d94..1c6943373 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc @@ -105,10 +105,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index 892da2c72..2e43709f8 100644 --- a/scripts/makefile.macosx +++ b/scripts/makefile.macosx @@ -20,7 +20,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER) PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 VER = $(PNGMAJ).$(PNGMIN) LIBNAME=libpng12 SHAREDLIB_POSTFIX=dylib @@ -71,10 +71,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.3*$(SHAREDLIB_POSTFIX) - cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(LIBPATH) - chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) -@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.$(SHAREDLIB_POSTFIX) -@/bin/rm -f$(LIBPATH)/$(LIBNAME).$(SHAREDLIB_POSTFIX) + cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(LIBPATH) + chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) (cd $(LIBPATH); ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \ $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \ ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \ diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 7e711ea6a..d47869fa2 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include LIB=png # Shared lib name should be png12. SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.2beta3 +SHLIB_MINOR= 1.2.2beta4 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.sco b/scripts/makefile.sco index 757f32ad8..01d1378fd 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -25,7 +25,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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -85,10 +85,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 3127b3a0d..04cb84ef5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -24,7 +24,7 @@ LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm LDSHARED=CC $(ABI) -shared PNGMAJ = 0 -PNGMIN = 1.2.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # See "man dso" for info about shared objects LIBS=libpng12.so.$(PNGMAJ).$(PNGVER) @@ -76,10 +76,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index c49a65987..ee916e72f 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) RANLIB=echo @@ -84,10 +84,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index a134bfe6e..a63f99630 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -35,7 +35,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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -106,10 +106,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 28a148bfd..6b1c093b5 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.2beta3 +PNGMIN = 1.2.2beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 @@ -103,10 +103,10 @@ install-static: install-headers libpng.a install-shared: install-headers $(LIBNAME).so.$(PNGVER) -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi -@/bin/rm -f $(LIBPATH)/libpng.so.3* + -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so cp $(LIBNAME).so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/$(LIBNAME).so.$(PNGVER) - -@/bin/rm -f $(LIBPATH)/$(LIBNAME).so.$(PNGMAJ)* $(LIBPATH)/$(LIBNAME).so - (cd $(LIBPATH); + (cd $(LIBPATH); \ ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) -@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index fa54072c6..c17c2be11 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.2beta3'; + PNG_LIBPNG_VER_STRING = '1.2.2beta4'; PNG_LIBPNG_VER = 10202; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index ac035d2c7..8f2a007e3 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.2beta3 +; Version 1.2.2beta4 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |
