diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2002-04-07 16:35:38 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:06:54 -0500 |
| commit | fcbd7870e990295c398a58195e7688eed84e9993 (patch) | |
| tree | aaf01153013819fcaa9670691c5613bfbba87590 | |
| parent | 25228abdc1c5f1a56282a34bd076f0a8edb099ee (diff) | |
| download | libpng-1.2.2rc1.tar.gz | |
Imported from libpng-1.2.2rc1.tarv1.2.2rc1
65 files changed, 271 insertions, 136 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.2beta6 - March 31, 2002 +Libpng 1.2.2rc1 - April 7, 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. @@ -45,10 +45,15 @@ version 1.2.2beta5 [March 26, 2002] Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so version 1.2.2beta6 [March 31, 2002] +version 1.0.13beta1 [March 31, 2002] Prevent png_zalloc() from trying to memset memory that it failed to acquire. Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). Ensure that the right function (user or default) is used to free the png_struct after an error in png_create_read_struct_2(). +version 1.2.2rc1 [April 7, 2002] + Save the ebx register in pnggccrd.c (Sami Farin) + Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner). + Updated makefiles to put headers in include/libpng and remove old include/*.h. Send comments/corrections/commendations to png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu @@ -1055,10 +1055,15 @@ version 1.2.2beta5 [March 26, 2002] Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so version 1.2.2beta6 [March 31, 2002] +version 1.0.13beta1 [March 31, 2002] Prevent png_zalloc() from trying to memset memory that it failed to acquire. Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). Ensure that the right function (user or default) is used to free the png_struct after an error in png_create_read_struct_2(). +version 1.2.2rc1 [April 7, 2002] + Save the ebx register in pnggccrd.c (Sami Farin) + Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner). + Updated makefiles to put headers in include/libpng and remove old include/*.h. 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.2beta6 - March 31, 2002 +Installing libpng version 1.2.2rc1 - April 7, 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.2beta6" or "lpng109" and "zlib-1.1.3" +might be called "libpng-1.2.2rc1" 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.2beta6) - makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2beta6, + makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2rc1) + makefile.gcmmx => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.2rc1, 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.2beta6) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2rc1) makefile.sunos => Sun makefile - makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2beta6) - makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2beta6) + makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.2rc1) + makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.2rc1) 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.2beta6 +Known bugs in libpng version 1.2.2rc1 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.2beta6, March 31, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.2rc1, April 7, 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 @@ -99,4 +99,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -March 31, 2002 +April 7, 2002 @@ -1,4 +1,4 @@ -README for libpng 1.2.2beta6 - March 31, 2002 (shared library 2.1) +README for libpng 1.2.2rc1 - April 7, 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.2beta6) + (gcc, creates libpng12.so.0.1.2.2rc1) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.2beta6, uses assembler code + libpng12.so.0.1.2.2rc1, 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.2beta6) + makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.2rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.2beta6) + (gcc, creates libpng12.so.0.1.2.2rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.2beta6) + (gcc, creates libpng12.so.0.1.2.2rc1) 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 31, 2002 + April 7, 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.2beta6 are Y2K compliant. It is my belief that earlier + upward through 1.2.2rc1 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.2beta6. Instead, please + There is no \"configure\" script for Libpng-1.2.2rc1. Instead, please copy the appropriate makefile for your system from the \"scripts\" directory. Read the INSTALL file for more details. " diff --git a/contrib/pngsuite/README b/contrib/pngsuite/README new file mode 100644 index 000000000..714d12c64 --- /dev/null +++ b/contrib/pngsuite/README @@ -0,0 +1,85 @@ + +pngsuite +-------- +(c) Willem van Schaik, 1999 + +Permission to use, copy, and distribute these images for any purpose and +without fee is hereby granted. + +These 15 images are part of the much larger PngSuite test-set of +images, available for developers of PNG supporting software. The +complete set, available at http:/www.schaik.com/pngsuite/, contains +a variety of images to test interlacing, gamma settings, ancillary +chunks, etc. + +The images in this directory represent the basic PNG color-types: +grayscale (1-16 bit deep), full color (8 or 16 bit), paletted +(1-8 bit) and grayscale or color images with alpha channel. You +can use them to test the proper functioning of PNG software. + + filename depth type + ------------ ------ -------------- + basn0g01.png 1-bit grayscale + basn0g02.png 2-bit grayscale + basn0g04.png 4-bit grayscale + basn0g08.png 8-bit grayscale + basn0g16.png 16-bit grayscale + basn2c08.png 8-bit truecolor + basn2c16.png 16-bit truecolor + basn3p01.png 1-bit paletted + basn3p02.png 2-bit paletted + basn3p04.png 4-bit paletted + basn3p08.png 8-bit paletted + basn4a08.png 8-bit gray with alpha + basn4a16.png 16-bit gray with alpha + basn6a08.png 8-bit RGBA + basn6a16.png 16-bit RGBA + +Here is the correct result of typing "pngtest -m *.png" in +this directory: + +Testing basn0g01.png: PASS (524 zero samples) + Filter 0 was used 32 times +Testing basn0g02.png: PASS (448 zero samples) + Filter 0 was used 32 times +Testing basn0g04.png: PASS (520 zero samples) + Filter 0 was used 32 times +Testing basn0g08.png: PASS (3 zero samples) + Filter 1 was used 9 times + Filter 4 was used 23 times +Testing basn0g16.png: PASS (1 zero samples) + Filter 1 was used 1 times + Filter 2 was used 31 times +Testing basn2c08.png: PASS (6 zero samples) + Filter 1 was used 5 times + Filter 4 was used 27 times +Testing basn2c16.png: PASS (592 zero samples) + Filter 1 was used 1 times + Filter 4 was used 31 times +Testing basn3p01.png: PASS (512 zero samples) + Filter 0 was used 32 times +Testing basn3p02.png: PASS (448 zero samples) + Filter 0 was used 32 times +Testing basn3p04.png: PASS (544 zero samples) + Filter 0 was used 32 times +Testing basn3p08.png: PASS (4 zero samples) + Filter 0 was used 32 times +Testing basn4a08.png: PASS (32 zero samples) + Filter 1 was used 1 times + Filter 4 was used 31 times +Testing basn4a16.png: PASS (64 zero samples) + Filter 0 was used 1 times + Filter 1 was used 2 times + Filter 2 was used 1 times + Filter 4 was used 28 times +Testing basn6a08.png: PASS (160 zero samples) + Filter 1 was used 1 times + Filter 4 was used 31 times +Testing basn6a16.png: PASS (1072 zero samples) + Filter 1 was used 4 times + Filter 4 was used 28 times +libpng passes test + +Willem van Schaik +<willem@schaik.com> +October 1999 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 31, 2002" +.TH LIBPNG 3 "April 7, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2rc1 .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.2beta6 - March 31, 2002 + libpng version 1.2.2rc1 - April 7, 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 31, 2002 +April 7, 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.2beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.2rc1 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,6 +3773,9 @@ the first widely used release: 1.2.1rc1-2 3 10201 3.1.2.1rc1-2 1.2.1 3 10201 3.1.2.1 1.2.2beta1-6 12 10202 12.so.0.1.2.2beta1-6 + 1.0.13beta1 10 10013 10.so.0.1.0.13beta1 + 1.0.13rc1 10 10013 10.so.0.1.0.13rc1 + 1.2.2rc1 12 10202 12.so.0.1.2.2rc1 Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3830,7 +3833,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.2beta6 - March 31, 2002: +Libpng version 1.2.2rc1 - April 7, 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 +3850,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.2beta6, March 31, 2002, are +libpng versions 1.0.7, July 1, 2000, through 1.2.2rc1, April 7, 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 +3942,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson randeg@alum.rpi.edu -March 31, 2002 +April 7, 2002 .\" end of man page diff --git a/libpng.txt b/libpng.txt index bc6c3b3ed..099e55cbc 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.2beta6 - March 31, 2002 + libpng version 1.2.2rc1 - April 7, 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 31, 2002 +April 7, 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.2beta6 are Y2K compliant. It is my belief that earlier +upward through 1.2.2rc1 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 22ddde887..0b21c5fc7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 31, 2002" +.TH LIBPNGPF 3 "April 7, 2002" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2beta6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.2rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 31, 2002" +.TH PNG 5 "April 7, 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.2beta6 - March 31, 2002 + * libpng version 1.2.2rc1 - April 7, 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_2beta6 Your_png_h_is_not_version_1_2_2beta6; +typedef version_1_2_2rc1 Your_png_h_is_not_version_1_2_2rc1; /* 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.2beta6"; +const char png_libpng_ver[18] = "1.2.2rc1"; /* 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.2beta6 - March 31, 2002\n\ + return ((png_charp) "\n libpng version 1.2.2rc1 - April 7, 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.2beta6"); - return((png_charp) "1.2.2beta6"); + return((png_charp) "1.2.2rc1"); + return((png_charp) "1.2.2rc1"); } png_charp PNGAPI @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.2beta6 - March 31, 2002 + * libpng version 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002: Glenn + * libpng versions 0.97, January 1998, through 1.2.2rc1 - April 7, 2002: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -82,6 +82,9 @@ * 1.2.1rc1-2 3 10201 3.1.2.1rc1-2 * 1.2.1 3 10201 3.1.2.1 * 1.2.2beta1-6 12 10202 12.so.0.1.2.2beta1-6 + * 1.0.13beta1 10 10013 10.so.0.1.0.13beta1 + * 1.0.13rc1 10 10013 10.so.0.1.0.13rc1 + * 1.2.2rc1 12 10202 12.so.0.1.2.2rc1 * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -111,7 +114,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.2beta6, March 31, 2002, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.2rc1, April 7, 2002, are * Copyright (c) 2000-2001 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 +219,13 @@ * Y2K compliance in libpng: * ========================= * - * March 31, 2002 + * April 7, 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.2beta6 are Y2K compliant. It is my belief that earlier + * upward through 1.2.2rc1 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 +281,7 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.2beta6" +#define PNG_LIBPNG_VER_STRING "1.2.2rc1" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% @@ -290,7 +293,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 6 +#define PNG_LIBPNG_VER_BUILD 1 #define PNG_LIBPNG_BUILD_ALPHA 1 #define PNG_LIBPNG_BUILD_BETA 2 @@ -298,7 +301,7 @@ #define PNG_LIBPNG_BUILD_STABLE 4 #define PNG_LIBPNG_BUILD_TYPEMASK 7 #define PNG_LIBPNG_BUILD_PATCH 8 /* Can be OR'ed with STABLE only */ -#define PNG_LIBPNG_BUILD_TYPE 2 +#define PNG_LIBPNG_BUILD_TYPE 3 /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1258,9 +1261,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.2beta6 + version 1.2.2rc1 */ -typedef png_structp version_1_2_2beta6; +typedef png_structp version_1_2_2rc1; typedef png_struct FAR * FAR * png_structpp; @@ -2389,7 +2392,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.2beta6 - March 31, 2002 (header)\n" + " libpng version 1.2.2rc1 - April 7, 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 39ad638e5..10a895e4e 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 f5882a0cc..aae7650fc 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 7c96f63d9..8a6e312c5 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.2beta6 - March 31, 2002 + * libpng version 1.2.2rc1 - April 7, 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 @@ -4918,6 +4918,9 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row, __asm__ __volatile__ ( //pre "movl row, %%edi \n\t" // get # of bytes to alignment +#ifdef __PIC__ + "pushl %%ebx \n\t" +#endif "movl %%edi, %%ecx \n\t" "xorl %%ebx, %%ebx \n\t" "addl $0x7, %%ecx \n\t" @@ -5017,6 +5020,9 @@ png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row, "up_end: \n\t" "EMMS \n\t" // conversion of filtered row complete +#ifdef __PIC__ + "popl %%ebx \n\t" +#endif : "=d" (dummy_value_d), // 0 // output regs (dummy) "=S" (dummy_value_S), // 1 @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 8493860d5..a32e80f15 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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) @@ -782,7 +782,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.2beta6 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2rc1 */ void PNGAPI @@ -831,7 +831,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.2beta6 + * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.2rc1 */ 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 13863ad7f..04b8d8459 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 f2e6a6faf..c60cb9cd0 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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_2beta6 your_png_h_is_not_version_1_2_2beta6; +typedef version_1_2_2rc1 your_png_h_is_not_version_1_2_2rc1; diff --git a/pngtrans.c b/pngtrans.c index da6200d25..ec6812e72 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng version 1.2.2rc1 - April 7, 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 088fe7bd8..974da4b11 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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) @@ -953,6 +953,7 @@ png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr) png_ptr = *png_ptr_ptr; #ifdef PNG_USER_MEM_SUPPORTED free_fn = png_ptr->free_fn; + mem_ptr = png_ptr->mem_ptr; #endif } diff --git a/pngwtran.c b/pngwtran.c index a70b74050..293d22348 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.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 3e871dd3f..b74a03a9d 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * libpng 1.2.2beta6 - March 31, 2002 + * libpng 1.2.2rc1 - April 7, 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 b413f6fc6..7f06c7142 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.2beta6 (March 31, 2002) and zlib +libpng 1.2.2rc1 (April 7, 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 56777381a..3e7523ec5 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.2beta6 +;Version 1.2.2rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/projects/netware.txt b/projects/netware.txt index f0819c2e7..ce0fa58d4 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.2beta6-project-netware.zip from a libpng distribution +libpng-1.2.2rc1-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.2beta6-project-netware.zip" +"unzip -a libpng-1.2.2rc1-project-netware.zip" diff --git a/projects/wince.txt b/projects/wince.txt index 5ebf608fe..52fd91367 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.2beta6-project-wince.zip from a libpng distribution +libpng-1.2.2rc1-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.2beta6-project-wince.zip" +"unzip -a libpng-1.2.2rc1-project-wince.zip" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index e4e96fbe8..3637c87ee 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.2beta6 +Version: 1.2.2rc1 Libs: -L${libdir} -lpng12 Cflags: -I${includedir}/libpng12 diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 6c068a60a..90680f89f 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index f07bc4957..80f04dbf9 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -33,7 +33,7 @@ RANLIB=echo LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 57cc44c25..4743eac5d 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -57,9 +57,12 @@ pngtest$(E): pngtest$(O) libpng$(A) install: libpng.a -@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi + -@if [ ! -d $(INCPATH)/libpng ]; then mkdir $(INCPATH)/libpng; fi -@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi - cp png.h pngconf.h $(INCPATH) - chmod 644 $(INCPATH)/png.h $(INCPATH)/pngconf.h + -@rm $(INCPATH)/png.h + -@rm $(INCPATH)/pngconf.h + cp png.h pngconf.h $(INCPATH)/libpng + chmod 644 $(INCPATH)/libpng/png.h $(INCPATH)/libpng/pngconf.h cp libpng.a $(LIBPATH) clean: diff --git a/scripts/makefile.atari b/scripts/makefile.atari index 2d14ff8c1..c51ad6ec2 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -26,8 +26,11 @@ pngtest.ttp: pngtest.o $(LBR) install: libpng.a -@mkdir $(prefix)/include + -@mkdir $(prefix)/include/libpng -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h + -@rm -f $(prefix)/include/png.h + -@rm -f $(prefix)/include/pngconf.h + cp png.h $(prefix)/include/libpng + cp pngconf.h $(prefix)/include/libpng + chmod 644 $(prefix)/include/libpng/png.h + chmod 644 $(prefix)/include/libpng/pngconf.h diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 15ffd4906..dfb8e98fd 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) ALIGN= diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 417eb3570..939e3aa14 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -12,6 +12,10 @@ # $CFLAGS, and include pnggccrd.o in $OBJS, below. CC=gcc +ifdef MINGW +MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw +MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw +endif # where "make install" puts libpng.a, libpng.so*, png.h, and pngconf.h prefix=/usr @@ -32,14 +36,12 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ #CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ # -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5 -CFLAGS=-I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ +CFLAGS=$(MINGW_CCFLAGS) -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \ -fomit-frame-pointer -# read libpng.txt or png.h to see why PNGMAJ is 0. You should not -# have to change it. PNGMAJ = 0 #PNGDLL = $12 -PNGMIN = 1.2.2beta6 +PNGMIN = 1.2.2rc1 PNGMIN_BASE = 1.2.2 PNGVER = $(PNGMAJ).$(PNGMIN) @@ -50,8 +52,8 @@ SHAREDDEF=libpng.def LIBS=$(SHAREDLIB) $(STATLIB) EXE=.exe -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -LDSHARED=gcc -shared -Wl,--enable-auto-image-base +LDFLAGS=-L. $(MINGW_LDFLAGS) -L$(ZLIBLIB) -lpng -lz +LDSFLAGS=-shared -L. $(MINGW_LDFLAGS) -Wl,--enable-auto-image-base LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(SHAREDDEF) RANLIB=ranlib @@ -111,7 +113,7 @@ $(SHAREDDEF): projects/msvc/png32ms.def sed -e 's/\([^;]*\);/;/' > $@ $(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF) - $(LDSHARED) -o $@ $(LDEXTRA) $(OBJSDLL) -L. -L$(ZLIBLIB) -lz + $(CC) $(LDSFLAGS) -o $@ $(LDEXTRA) $(OBJSDLL) -L. -L$(ZLIBLIB) -lz pngtest$(EXE): pngtest.pic.o $(SHAREDLIB) $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ @@ -146,7 +148,10 @@ install-shared: $(SHAREDLIB) install-headers install-docs install-man install -s -m 755 $(SHAREDLIB) $(BINPATH) install-headers: - -@if [ ! -d $(INCPATH) ]; then mkdir -p $(INCPATH); fi + -@if [ ! -d $(INCPATH)]; then mkdir -p $(INCPATH); fi + -@if [ ! -d $(INCPATH)/libpng ]; then mkdir -p $(INCPATH)/libpng; fi + -@rm -f ${INCPATH)/png.h + -@rm -f ${INCPATH)/pngconf.h install -m 644 png.h pngconf.h $(INCPATH) install-docs: diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index beb3b228a..a828b14c1 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 3da673770..d6acac2f1 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 5b9ba308a..9c4285224 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -15,7 +15,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index aeb2b101c..3a1d3c59c 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 4823bb425..9a72da01f 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 09a74b6fc..4d7707b71 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -47,11 +47,14 @@ test: pngtest install: libpng.a -@mkdir $(prefix)/include + -@mkdir $(prefix)/include/libpng -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h + -@rm -f $(prefix)/include/png.h + -@rm -f $(prefix)/include/pngconf.h + cp png.h $(prefix)/include/libpng + cp pngconf.h $(prefix)/include/libpng + chmod 644 $(prefix)/include/libpng/png.h + chmod 644 $(prefix)/include/libpng/pngconf.h cp libpng.a $(prefix)/lib chmod 644 $(prefix)/lib/libpng.a diff --git a/scripts/makefile.linux b/scripts/makefile.linux index a614790b8..2a0202e51 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -5,7 +5,7 @@ LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) CC=gcc diff --git a/scripts/makefile.macosx b/scripts/makefile.macosx index aa117d713..447bf0ffa 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.2beta6 +PNGMIN = 1.2.2rc1 VER = $(PNGMAJ).$(PNGMIN) LIBNAME=libpng12 SHAREDLIB_POSTFIX=dylib diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 8db26277f..602a2f945 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -31,11 +31,14 @@ test: pngtest install: libpng.a -@mkdir $(prefix)/include + -@mkdir $(prefix)/include/libpng -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h + -@rm -f $(prefix)/include/png.h + -@rm -f $(prefix)/include/pngconf.h + cp png.h $(prefix)/include/libpng + cp pngconf.h $(prefix)/include/libpng + chmod 644 $(prefix)/include/libpng/png.h + chmod 644 $(prefix)/include/libpng/pngconf.h cp libpng.a $(prefix)/lib chmod 644 $(prefix)/lib/libpng.a diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 61cc76acd..9b7b2e4a6 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -7,13 +7,13 @@ LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man -INCSDIR=${LOCALBASE}/include +INCSDIR=${LOCALBASE}/include/libpng # Should also copy png.h and pngconf.h to $(INCSDIR)/libpng12. LIB=png # Shared lib name should be png12. SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.2beta6 +SHLIB_MINOR= 1.2.2rc1 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 e9f6cc71c..4240ede4b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -6,8 +6,8 @@ PREFIX?= /usr/local LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 0 +SHLIB_MINOR= 1.2.2rc1 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ @@ -37,8 +37,8 @@ test: pngtest LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest beforeinstall: - if [ ! -d ${DESTDIR}${PREFIX}/include ]; then \ - ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \ + if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \ + ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \ fi if [ ! -d ${DESTDIR}${LIBDIR} ]; then \ ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \ @@ -59,9 +59,11 @@ beforeinstall: afterinstall: @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a @rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a + @rm -f ${DESTDIR}${PREFIX}/include/png.h + @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ - -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include + -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \ -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 07506de8e..c5050def1 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -25,11 +25,11 @@ 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 -INCPATH=$(prefix)/include +INCPATH=$(prefix)/include/libpng LIBPATH=$(prefix)/lib OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ @@ -69,6 +69,8 @@ test: pngtest install-headers: png.h pngconf.h -@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi -@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi + -@/bin/rm -f $(INCPATH)/png.h + -@/bin/rm -f $(INCPATH)/pngconf.h cp png.h pngconf.h $(INCPATH)/$(LIBNAME) chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h -@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 399549e2e..4b98287e3 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # See "man dso" for info about shared objects LIBS=libpng12.so.$(PNGMAJ).$(PNGVER) diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index a8c08b262..b224da4de 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) RANLIB=echo diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index a15cb2d6c..3a8a314b3 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index f1961901a..44cd0e3b2 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.2beta6 +PNGMIN = 1.2.2rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.std b/scripts/makefile.std index 824744985..15e569a06 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -36,11 +36,14 @@ test: pngtest install: libpng.a -@mkdir $(prefix)/include + -@mkdir $(prefix)/include/libpng -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h + -@rm -f $(prefix)/include/png.h + -@rm -f $(prefix)/include/pngconf.h + cp png.h $(prefix)/include/libpng + cp pngconf.h $(prefix)/include/libpng + chmod 644 $(prefix)/include/libpng/png.h + chmod 644 $(prefix)/include/libpng/pngconf.h cp libpng.a $(prefix)/lib chmod 644 $(prefix)/lib/libpng.a diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 220393153..cdce37275 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -40,11 +40,14 @@ test: pngtest install: libpng.a -@mkdir $(prefix)/include + -@mkdir $(prefix)/include/libpng -@mkdir $(prefix)/lib - cp png.h $(prefix)/include - cp pngconf.h $(prefix)/include - chmod 644 $(prefix)/include/png.h - chmod 644 $(prefix)/include/pngconf.h + -@rm -f $(prefix)/include/png.h + -@rm -f $(prefix)/include/pngconf.h + cp png.h $(prefix)/include/libpng + cp pngconf.h $(prefix)/include/libpng + chmod 644 $(prefix)/include/libpng/png.h + chmod 644 $(prefix)/include/libpng/pngconf.h cp libpng.a $(prefix)/lib chmod 644 $(prefix)/lib/libpng.a diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 776c6f61a..df1323190 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -7,7 +7,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.2.2beta6'; + PNG_LIBPNG_VER_STRING = '1.2.2rc1'; PNG_LIBPNG_VER = 10202; type diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 35560161c..153b33a0c 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.2beta6 +; Version 1.2.2rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" |