mirror of
				https://git.code.sf.net/p/libpng/code.git
				synced 2025-07-10 18:04:09 +02:00 
			
		
		
		
	Imported from libpng-1.2.8beta5.tar
This commit is contained in:
		
							parent
							
								
									878b31e0b4
								
							
						
					
					
						commit
						4093607bc9
					
				
							
								
								
									
										12
									
								
								ANNOUNCE
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								ANNOUNCE
									
									
									
									
									
								
							| @ -1,5 +1,5 @@ | ||||
| 
 | ||||
| Libpng 1.2.8beta4 - November 13, 2004 | ||||
| Libpng 1.2.8beta5 - November 20, 2004 | ||||
| 
 | ||||
| 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. | ||||
| @ -15,15 +15,21 @@ version 1.2.8beta1 [November 1, 2004] | ||||
| version 1.2.8beta2 [November 2, 2004] | ||||
|   Reduce color_type to a nonalpha type after strip alpha operation in | ||||
|     png_do_strip_filler(). | ||||
| version 1.2.8beta3 [November 13, 2004] | ||||
| version 1.2.8beta3 [November 3, 2004] | ||||
|   Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM | ||||
| version 1.2.8beta4 [November 13, 2004] | ||||
| version 1.2.8beta4 [November 12, 2004] | ||||
|   Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin). | ||||
|   Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin). | ||||
|   Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection | ||||
|     of data type in deflate (Cosmin). | ||||
|   Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of | ||||
|     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. | ||||
| version 1.2.8beta5 [November 20, 2004] | ||||
|   Use png_ptr->flags instead of png_ptr->transformations to pass | ||||
|     PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI | ||||
|     compatibility. | ||||
|   Revised handling of SPECIALBUILD, PRIVATEBUILD,  | ||||
|     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. | ||||
| 
 | ||||
| Send comments/corrections/commendations to | ||||
| png-implement@ccrc.wustl.edu (subscription required; write to | ||||
|  | ||||
							
								
								
									
										10
									
								
								CHANGES
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								CHANGES
									
									
									
									
									
								
							| @ -1373,15 +1373,21 @@ version 1.2.8beta1 [November 1, 2004] | ||||
| version 1.2.8beta2 [November 2, 2004] | ||||
|   Reduce color_type to a nonalpha type after strip alpha operation in | ||||
|     png_do_strip_filler(). | ||||
| version 1.2.8beta3 [Novermber 3, 2004] | ||||
| version 1.2.8beta3 [November 3, 2004] | ||||
|   Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM | ||||
| version 1.2.8beta4 [November 13, 2004] | ||||
| version 1.2.8beta4 [November 12, 2004] | ||||
|   Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin). | ||||
|   Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin). | ||||
|   Set png_ptr->zstream.data_type to Z_BINARY, to avoid unnecessary detection | ||||
|     of data type in deflate (Cosmin). | ||||
|   Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of | ||||
|     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. | ||||
| version 1.2.8beta5 [November 20, 2004] | ||||
|   Use png_ptr->flags instead of png_ptr->transformations to pass | ||||
|     PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI | ||||
|     compatibility. | ||||
|   Revised handling of SPECIALBUILD, PRIVATEBUILD,  | ||||
|     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING. | ||||
| 
 | ||||
| Send comments/corrections/commendations to | ||||
| png-implement@ccrc.wustl.edu (subscription required; write to | ||||
|  | ||||
							
								
								
									
										14
									
								
								INSTALL
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								INSTALL
									
									
									
									
									
								
							| @ -1,5 +1,5 @@ | ||||
| 
 | ||||
| Installing libpng version 1.2.8beta4 - November 13, 2004 | ||||
| Installing libpng version 1.2.8beta5 - November 20, 2004 | ||||
| 
 | ||||
| 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.8beta4" or "lpng109" and "zlib-1.2.1" | ||||
| might be called "libpng-1.2.8beta5" or "lpng109" and "zlib-1.2.1" | ||||
| or "zlib121") so that you have directories called "zlib" and "libpng". | ||||
| 
 | ||||
| Your directory structure should look like this: | ||||
| @ -67,9 +67,9 @@ include | ||||
| 
 | ||||
|  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a) | ||||
|  makefile.linux    =>  Linux/ELF makefile | ||||
|                        (gcc, creates libpng12.so.0.1.2.8beta4) | ||||
|                        (gcc, creates libpng12.so.0.1.2.8beta5) | ||||
|  makefile.gcmmx    =>  Linux/ELF makefile | ||||
|                        (gcc, creates libpng12.so.0.1.2.8beta4, | ||||
|                        (gcc, creates libpng12.so.0.1.2.8beta5, | ||||
|                        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 | ||||
| @ -92,12 +92,12 @@ include | ||||
|  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.8beta4) | ||||
|                        creates libpng12.so.0.1.2.8beta5) | ||||
|  makefile.sunos    =>  Sun makefile | ||||
|  makefile.solaris  =>  Solaris 2.X makefile (gcc, | ||||
|                        creates libpng12.so.0.1.2.8beta4) | ||||
|                        creates libpng12.so.0.1.2.8beta5) | ||||
|  makefile.so9      =>  Solaris 9 makefile (gcc, | ||||
|                        creates libpng12.so.0.1.2.8beta4) | ||||
|                        creates libpng12.so.0.1.2.8beta5) | ||||
|  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 | ||||
|  | ||||
							
								
								
									
										2
									
								
								KNOWNBUG
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								KNOWNBUG
									
									
									
									
									
								
							| @ -1,5 +1,5 @@ | ||||
| 
 | ||||
| Known bugs in libpng version 1.2.8beta4 | ||||
| Known bugs in libpng version 1.2.8beta5 | ||||
| 
 | ||||
| 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when | ||||
|    reading interlaced PNG files, when assembler code is enabled but running | ||||
|  | ||||
							
								
								
									
										4
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								LICENSE
									
									
									
									
									
								
							| @ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: | ||||
| If you modify libpng you may insert additional notices immediately following | ||||
| this sentence. | ||||
| 
 | ||||
| libpng version 1.2.6, November 13, 2004, is | ||||
| libpng version 1.2.6, November 20, 2004, is | ||||
| Copyright (c) 2004 Glenn Randers-Pehrson, and is | ||||
| distributed according to the same disclaimer and license as libpng-1.2.5 | ||||
| with the following individual added to the list of Contributing Authors | ||||
| @ -106,4 +106,4 @@ certification mark of the Open Source Initiative. | ||||
| 
 | ||||
| Glenn Randers-Pehrson | ||||
| glennrp@users.sourceforge.net | ||||
| November 13, 2004 | ||||
| November 20, 2004 | ||||
|  | ||||
							
								
								
									
										12
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								README
									
									
									
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| README for libpng version 1.2.8beta4 - November 13, 2004 (shared library 12.0) | ||||
| README for libpng version 1.2.8beta5 - November 20, 2004 (shared library 12.0) | ||||
| See the note about version numbers near the top of png.h | ||||
| 
 | ||||
| See INSTALL for instructions on how to install libpng. | ||||
| @ -189,9 +189,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.8beta4) | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta5) | ||||
|        makefile.gcmmx   =>  Linux/ELF makefile | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta4, | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta5, | ||||
|                             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 | ||||
| @ -213,12 +213,12 @@ Files in this distribution: | ||||
|        makefile.openbsd =>  OpenBSD makefile | ||||
|        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib) | ||||
|        makefile.sggcc   =>  Silicon Graphics | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta4) | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta5) | ||||
|        makefile.sunos   =>  Sun makefile | ||||
|        makefile.solaris =>  Solaris 2.X makefile | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta4) | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta5) | ||||
|        makefile.so9     =>  Solaris 9 makefile | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta4) | ||||
|                             (gcc, creates libpng12.so.0.1.2.8beta5) | ||||
|        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 | ||||
|  | ||||
							
								
								
									
										4
									
								
								Y2KINFO
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Y2KINFO
									
									
									
									
									
								
							| @ -1,13 +1,13 @@ | ||||
|    Y2K compliance in libpng: | ||||
|    ========================= | ||||
| 
 | ||||
|       November 13, 2004 | ||||
|       November 20, 2004 | ||||
| 
 | ||||
|       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.8beta4 are Y2K compliant.  It is my belief that earlier | ||||
|       upward through 1.2.8beta5 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 | ||||
|  | ||||
							
								
								
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @ -1,13 +1,13 @@ | ||||
| #!/bin/sh | ||||
| echo " | ||||
|   There is no \"configure\" script in this distribution of | ||||
|   libpng-1.2.8beta4. | ||||
|   libpng-1.2.8beta5. | ||||
| 
 | ||||
|   Instead, please copy the appropriate makefile for your system from the | ||||
|   \"scripts\" directory.  Read the INSTALL file for more details. | ||||
| 
 | ||||
|   Update, July 2004: you can get a "configure" based distribution | ||||
|   from the libpng distribution sites.  Download the file | ||||
|   libpng-1.2.8beta4-config.tar.gz | ||||
|   libpng-1.2.8beta5-config.tar.gz | ||||
| " | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										18
									
								
								libpng.3
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								libpng.3
									
									
									
									
									
								
							| @ -1,6 +1,6 @@ | ||||
| .TH LIBPNG 3 "November 13, 2004" | ||||
| .TH LIBPNG 3 "November 20, 2004" | ||||
| .SH NAME | ||||
| libpng \- Portable Network Graphics (PNG) Reference Library 1.2.8beta4 | ||||
| libpng \- Portable Network Graphics (PNG) Reference Library 1.2.8beta5 | ||||
| .SH SYNOPSIS | ||||
| \fI\fB | ||||
| 
 | ||||
| @ -781,7 +781,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.8beta4 - November 13, 2004 | ||||
|  libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  Updated and distributed by Glenn Randers-Pehrson | ||||
|  <glennrp@users.sourceforge.net> | ||||
|  Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
| @ -3685,13 +3685,13 @@ application: | ||||
| 
 | ||||
| .SH IX. Y2K Compliance in libpng | ||||
| 
 | ||||
| November 13, 2004 | ||||
| November 20, 2004 | ||||
| 
 | ||||
| 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.8beta4 are Y2K compliant.  It is my belief that earlier | ||||
| upward through 1.2.8beta5 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 | ||||
| @ -3839,7 +3839,7 @@ the first widely used release: | ||||
|  1.2.7rc1            13    10207  12.so.0.1.2.7rc1 | ||||
|  1.0.17              10    10017  12.so.0.1.0.17 | ||||
|  1.2.7               13    10207  12.so.0.1.2.7 | ||||
|  1.2.8beta1-3        13    10208  12.so.0.1.2.8beta1-3 | ||||
|  1.2.8beta1-5        13    10208  12.so.0.1.2.8beta1-5 | ||||
| 
 | ||||
| Henceforth the source version will match the shared-library minor | ||||
| and patch numbers; the shared-library major version number will be | ||||
| @ -3895,7 +3895,7 @@ possible without all of you. | ||||
| 
 | ||||
| Thanks to Frank J. T. Wojcik for helping with the documentation. | ||||
| 
 | ||||
| Libpng version 1.2.8beta4 - November 13, 2004: | ||||
| Libpng version 1.2.8beta5 - November 20, 2004: | ||||
| Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. | ||||
| Currently maintained by Glenn Randers-Pehrson (glennrp@users.sourceforge.net). | ||||
| 
 | ||||
| @ -3913,7 +3913,7 @@ included in the libpng distribution, the latter shall prevail.) | ||||
| If you modify libpng you may insert additional notices immediately following | ||||
| this sentence. | ||||
| 
 | ||||
| libpng version 1.2.6, November 13, 2004, is | ||||
| libpng version 1.2.6, November 20, 2004, is | ||||
| Copyright (c) 2004 Glenn Randers-Pehrson, and is | ||||
| distributed according to the same disclaimer and license as libpng-1.2.5 | ||||
| with the following individual added to the list of Contributing Authors | ||||
| @ -4012,7 +4012,7 @@ certification mark of the Open Source Initiative. | ||||
| 
 | ||||
| Glenn Randers-Pehrson | ||||
| glennrp@users.sourceforge.net | ||||
| November 13, 2004 | ||||
| November 20, 2004 | ||||
| 
 | ||||
| .\" end of man page | ||||
| 
 | ||||
|  | ||||
| @ -1,6 +1,6 @@ | ||||
| libpng.txt - A description on how to use and modify libpng | ||||
| 
 | ||||
|  libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  Updated and distributed by Glenn Randers-Pehrson | ||||
|  <glennrp@users.sourceforge.net> | ||||
|  Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
| @ -2904,13 +2904,13 @@ application: | ||||
| 
 | ||||
| IX. Y2K Compliance in libpng | ||||
| 
 | ||||
| November 13, 2004 | ||||
| November 20, 2004 | ||||
| 
 | ||||
| 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.8beta4 are Y2K compliant.  It is my belief that earlier | ||||
| upward through 1.2.8beta5 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 | ||||
|  | ||||
| @ -1,6 +1,6 @@ | ||||
| .TH LIBPNGPF 3 "November 13, 2004" | ||||
| .TH LIBPNGPF 3 "November 20, 2004" | ||||
| .SH NAME | ||||
| libpng \- Portable Network Graphics (PNG) Reference Library 1.2.8beta4 | ||||
| libpng \- Portable Network Graphics (PNG) Reference Library 1.2.8beta5 | ||||
| (private functions) | ||||
| .SH SYNOPSIS | ||||
| \fB\fB#include <png.h>\fP\fP | ||||
|  | ||||
							
								
								
									
										2
									
								
								png.5
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								png.5
									
									
									
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| .TH PNG 5 "November 13, 2004" | ||||
| .TH PNG 5 "November 20, 2004" | ||||
| .SH NAME | ||||
| png \- Portable Network Graphics (PNG) format | ||||
| .SH DESCRIPTION | ||||
|  | ||||
							
								
								
									
										6
									
								
								png.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								png.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* png.c - location for general purpose libpng functions
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -13,7 +13,7 @@ | ||||
| #include "png.h" | ||||
| 
 | ||||
| /* Generate a compiler error if there is an old png.h in the search path. */ | ||||
| typedef version_1_2_8beta4 Your_png_h_is_not_version_1_2_8beta4; | ||||
| typedef version_1_2_8beta5 Your_png_h_is_not_version_1_2_8beta5; | ||||
| 
 | ||||
| /* Version information for C files.  This had better match the version
 | ||||
|  * string defined in png.h.  */ | ||||
| @ -680,7 +680,7 @@ png_charp PNGAPI | ||||
| png_get_copyright(png_structp png_ptr) | ||||
| { | ||||
|    if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */ | ||||
|    return ((png_charp) "\n libpng version 1.2.8beta4 - November 13, 2004\n\
 | ||||
|    return ((png_charp) "\n libpng version 1.2.8beta5 - November 20, 2004\n\
 | ||||
|    Copyright (c) 1998-2004 Glenn Randers-Pehrson\n\ | ||||
|    Copyright (c) 1996-1997 Andreas Dilger\n\ | ||||
|    Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); | ||||
|  | ||||
							
								
								
									
										53
									
								
								png.h
									
									
									
									
									
								
							
							
						
						
									
										53
									
								
								png.h
									
									
									
									
									
								
							| @ -1,6 +1,6 @@ | ||||
| /* png.h - header file for PNG reference library
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) | ||||
| @ -8,7 +8,7 @@ | ||||
|  * Authors and maintainers: | ||||
|  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat | ||||
|  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger | ||||
|  *  libpng versions 0.97, January 1998, through 1.2.8beta4 - November 13, 2004: Glenn | ||||
|  *  libpng versions 0.97, January 1998, through 1.2.8beta5 - November 20, 2004: Glenn | ||||
|  *  See also "Contributing Authors", below. | ||||
|  * | ||||
|  * Note about libpng version numbers: | ||||
| @ -106,7 +106,7 @@ | ||||
|  *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1 | ||||
|  *    1.0.17                  10    10017  12.so.0.1.0.17 | ||||
|  *    1.2.7                   13    10207  12.so.0.1.2.7 | ||||
|  *    1.2.8beta1-3            13    10208  12.so.0.1.2.8beta1-3 | ||||
|  *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5 | ||||
|  * | ||||
|  *    Henceforth the source version will match the shared-library major | ||||
|  *    and minor numbers; the shared-library major version number will be | ||||
| @ -136,7 +136,7 @@ | ||||
|  * If you modify libpng you may insert additional notices immediately following | ||||
|  * this sentence. | ||||
|  * | ||||
|  * libpng versions 1.2.6, August 15, 2004, through 1.2.8beta4, November 13, 2004, are | ||||
|  * libpng versions 1.2.6, August 15, 2004, through 1.2.8beta5, November 20, 2004, are | ||||
|  * Copyright (c) 2004 Glenn Randers-Pehrson, and are | ||||
|  * distributed according to the same disclaimer and license as libpng-1.2.5 | ||||
|  * with the following individual added to the list of Contributing Authors: | ||||
| @ -248,13 +248,13 @@ | ||||
|  * Y2K compliance in libpng: | ||||
|  * ========================= | ||||
|  * | ||||
|  *    November 13, 2004 | ||||
|  *    November 20, 2004 | ||||
|  * | ||||
|  *    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.8beta4 are Y2K compliant.  It is my belief that earlier | ||||
|  *    upward through 1.2.8beta5 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 | ||||
| @ -310,9 +310,9 @@ | ||||
|  */ | ||||
| 
 | ||||
| /* Version information for png.h - this should match the version in png.c */ | ||||
| #define PNG_LIBPNG_VER_STRING "1.2.8beta4" | ||||
| #define PNG_LIBPNG_VER_STRING "1.2.8beta5" | ||||
| #define PNG_HEADER_VERSION_STRING \ | ||||
|    " libpng version 1.2.8beta4 - November 13, 2004 (header)\n" | ||||
|    " libpng version 1.2.8beta5 - November 20, 2004 (header)\n" | ||||
| 
 | ||||
| #define PNG_LIBPNG_VER_SONUM   0 | ||||
| #define PNG_LIBPNG_VER_DLLNUM  13 | ||||
| @ -324,16 +324,22 @@ | ||||
| /* This should match the numeric part of the final component of
 | ||||
|  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ | ||||
| 
 | ||||
| #define PNG_LIBPNG_VER_BUILD  4 | ||||
| #define PNG_LIBPNG_VER_BUILD  5 | ||||
| 
 | ||||
| /* Release Status */ | ||||
| #define PNG_LIBPNG_BUILD_ALPHA    1 | ||||
| #define PNG_LIBPNG_BUILD_BETA     2 | ||||
| #define PNG_LIBPNG_BUILD_RC       3 | ||||
| #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_PRIVATE 16 | ||||
| #define PNG_LIBPNG_BUILD_SPECIAL 32 | ||||
| #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7 | ||||
|    | ||||
| /* Release-Specific Flags */ | ||||
| #define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with | ||||
|                                        PNG_LIBPNG_BUILD_STABLE only */ | ||||
| #define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with | ||||
|                                        PNG_LIBPNG_BUILD_SPECIAL */ | ||||
| #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with | ||||
|                                        PNG_LIBPNG_BUILD_PRIVATE */ | ||||
| 
 | ||||
| /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
 | ||||
|  * We must not include leading zeros. | ||||
| @ -1317,7 +1323,7 @@ struct png_struct_def | ||||
| /* This triggers a compiler error in png.c, if png.c and png.h
 | ||||
|  * do not agree upon the version number. | ||||
|  */ | ||||
| typedef png_structp version_1_2_8beta4; | ||||
| typedef png_structp version_1_2_8beta5; | ||||
| 
 | ||||
| typedef png_struct FAR * FAR * png_structpp; | ||||
| 
 | ||||
| @ -2583,7 +2589,14 @@ extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp | ||||
| #define PNG_RGB_TO_GRAY_ERR  0x200000L | ||||
| #define PNG_RGB_TO_GRAY_WARN 0x400000L | ||||
| #define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */ | ||||
|                        /*    0x800000L     Unused */ | ||||
| #define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */ | ||||
|                        /*   0x2000000L  unused */ | ||||
|                        /*   0x4000000L  unused */ | ||||
|                        /*   0x8000000L  unused */ | ||||
|                        /*  0x10000000L  unused */ | ||||
|                        /*  0x20000000L  unused */ | ||||
|                        /*  0x40000000L  unused */ | ||||
| 
 | ||||
| /* flags for png_create_struct */ | ||||
| #define PNG_STRUCT_PNG   0x0001 | ||||
| @ -2617,6 +2630,16 @@ extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp | ||||
| #define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L | ||||
| #define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L | ||||
| #define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L | ||||
| #define PNG_FLAG_ADD_ALPHA                0x200000L  /* Added to libpng-1.2.8 */ | ||||
| #define PNG_FLAG_STRIP_ALPHA              0x400000L  /* Added to libpng-1.2.8 */ | ||||
|                                   /*      0x800000L  unused */ | ||||
|                                   /*     0x1000000L  unused */ | ||||
|                                   /*     0x2000000L  unused */ | ||||
|                                   /*     0x4000000L  unused */ | ||||
|                                   /*     0x8000000L  unused */ | ||||
|                                   /*    0x10000000L  unused */ | ||||
|                                   /*    0x20000000L  unused */ | ||||
|                                   /*    0x40000000L  unused */ | ||||
| 
 | ||||
| #define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \ | ||||
|                                      PNG_FLAG_CRC_ANCILLARY_NOWARN) | ||||
| @ -3092,7 +3115,7 @@ PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info, | ||||
| #if defined(PNG_WRITE_FILLER_SUPPORTED) || \ | ||||
|     defined(PNG_READ_STRIP_ALPHA_SUPPORTED) | ||||
| PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info, | ||||
|    png_bytep row, png_uint_32 flags, png_uint_32 transformations)); | ||||
|    png_bytep row, png_uint_32 flags)); | ||||
| #endif | ||||
| 
 | ||||
| #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED) | ||||
|  | ||||
							
								
								
									
										104
									
								
								pngconf.h
									
									
									
									
									
								
							
							
						
						
									
										104
									
								
								pngconf.h
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngconf.h - machine configurable file for libpng
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -22,36 +22,9 @@ | ||||
| #endif | ||||
| #define PNG_1_2_X | ||||
| 
 | ||||
| /* Added at libpng-1.2.8 */ | ||||
| #define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BETA | ||||
| 
 | ||||
| #if (PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_SPECIAL) | ||||
| /* SPECIALBUILD is deprecated.  Use PNG_LIBPNG_BUILD_SPECIAL_STRING instead. */ | ||||
| #  if defined(SPECIALBUILD) && !defined(PNG_LIBPNG_BUILD_SPECIAL_STRING) | ||||
| #    define PNG_LIBPNG_BUILD_TYPE_SAVE PNG_LIBPNG_BUILD_TYPE | ||||
| #    undef PNG_LIBPNG_BUILD_TYPE | ||||
| #    define PNG_LIBPNG_BUILD_TYPE \ | ||||
|         PNG_LIBPNG_BUILD_TYPE_SAVE|PNG_LIBPNG_BUILD_SPECIAL | ||||
| #    define PNG_LIBPNG_BUILD_SPECIAL_STRING SPECIALBUILD | ||||
| #  else | ||||
| #    if !defined(PNG_LIBPNG_BUILD_SPECIAL_STRING) | ||||
| #      define PNG_LIBPNG_BUILD_SPECIAL_STRING special build string. | ||||
| #    endif | ||||
| #  endif | ||||
| #endif | ||||
| #if (PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_PRIVATE) | ||||
| /* PRIVATEBUILD is deprecated.  Use PNG_LIBPNG_BUILD_PRIVATE_STRING instead. */ | ||||
| #  if defined(PRIVATEBUILD) && !defined(PNG_LIBPNG_BUILD_PRIVATE_STRING) | ||||
| #    undef PNG_LIBPNG_BUILD_TYPE | ||||
| #    define PNG_LIBPNG_BUILD_TYPE \ | ||||
|         PNG_LIBPNG_BUILD_TYPE_SAVE|PNG_LIBPNG_BUILD_PRIVATE | ||||
| #    define PNG_LIBPNG_BUILD_PRIVATE_STRING PRIVATEBUILD | ||||
| #  else | ||||
| #    if !defined(PNG_LIBPNG_BUILD_PRIVATE_STRING) | ||||
| #      define PNG_LIBPNG_BUILD_PRIVATE_STRING private build string. | ||||
| #    endif | ||||
| #  endif | ||||
| #endif | ||||
| 
 | ||||
| /* This is the size of the compression buffer, and thus the size of
 | ||||
|  * an IDAT chunk.  Make this whatever size you feel is best for your | ||||
|  * machine.  One of these will be allocated per png_struct.  When this | ||||
| @ -1403,5 +1376,78 @@ typedef z_stream FAR *  png_zstreamp; | ||||
| #endif /* PNG_INTERNAL */ | ||||
| #endif /* PNG_READ_SUPPORTED */ | ||||
| 
 | ||||
| /*
 | ||||
|  * Added at libpng-1.2.8 | ||||
|  * | ||||
|  *  Can define PNG_LIBPNG_BUILD_TYPE using only the following: | ||||
|  *             PNG_LIBPNG_BUILD_PRIVATE (including DLLFNAME_POSTFIX and | ||||
|  *             PNG_LIBPNG_BUILD_PRIVATE_STRING) | ||||
|  * | ||||
|  * Ref MSDN | ||||
|  * VS_FF_PRIVATEBUILD File was ****not built using standard release**** | ||||
|  * procedures. If this value is given, the StringFileInfo block must | ||||
|  * contain a PrivateBuild string.  | ||||
|  * | ||||
|  * VS_FF_SPECIALBUILD File was built by the original company *****using | ||||
|  * standard release procedures***** but is a variation of the standard | ||||
|  * file of the same version number. If this value is given, the | ||||
|  * StringFileInfo block must contain a SpecialBuild string.  | ||||
|  */ | ||||
| 
 | ||||
| #ifndef PNG_LIBPNG_BUILD_TYPE | ||||
| #  define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BASE_TYPE | ||||
| #else | ||||
| #  define PNG_LIBPNG_BUILD_TYPE_SAVE (PNG_LIBPNG_BUILD_TYPE & \ | ||||
|      PNG_LIBPNG_BUILD_PRIVATE) | ||||
| #  undef PNG_LIBPNG_BUILD_TYPE | ||||
| #  define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_BASE_TYPE | \ | ||||
|      PNG_LIBPNG_BUILD_TYPE_SAVE | ||||
| #  undef PNG_LIBPNG_BUILD_TYPE_SAVE | ||||
| #endif | ||||
|    | ||||
| #undef PNG_LIBPNG_BUILD_BASE_TYPE | ||||
|    | ||||
| /* Private as priority over Special */ | ||||
| #if ((PNG_LIBPNG_BUILD_TYPE & (PNG_LIBPNG_BUILD_PRIVATE | \ | ||||
|    PNG_LIBPNG_BUILD_SPECIAL)) == (PNG_LIBPNG_BUILD_PRIVATE | \ | ||||
|    PNG_LIBPNG_BUILD_SPECIAL)) | ||||
| #  define PNG_LIBPNG_BUILD_TYPE_SAVE PNG_LIBPNG_BUILD_TYPE | ||||
| #  define PNG_LIBPNG_BUILD_TYPE PNG_LIBPNG_BUILD_TYPE_SAVE & \ | ||||
|      ~PNG_LIBPNG_BUILD_SPECIAL | ||||
| #  undef PNG_LIBPNG_BUILD_TYPE_SAVE | ||||
| #endif | ||||
|    | ||||
| /* Verify if PNG_LIBPNG_BUILD_PRIVATE_STRING is defined if PNG_LIBPNG_BUILD_PRIVATE is set */ | ||||
| #if (PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_PRIVATE) | ||||
|   /*
 | ||||
|    * PRIVATEBUILD is deprecated. Use PNG_LIBPNG_BUILD_PRIVATE_STRING instead. | ||||
|    */ | ||||
| # if defined(PRIVATEBUILD) && !defined(PNG_LIBPNG_BUILD_PRIVATE_STRING) | ||||
| #   define PNG_LIBPNG_BUILD_PRIVATE_STRING PRIVATEBUILD | ||||
| # else | ||||
| #   if !defined(PNG_LIBPNG_BUILD_PRIVATE_STRING) | ||||
| #     error "PNG_LIBPNG_BUILD_PRIVATE_STRING must be defined if \ | ||||
|       PNG_LIBPNG_BUILD_PRIVATE set" | ||||
| #   endif | ||||
| # endif | ||||
| /* Verify if PNG_LIBPNG_BUILD_SPECIAL_STRING is defined \
 | ||||
|    if PNG_LIBPNG_BUILD_SPECIAL is set */ | ||||
| #else | ||||
| #  if (PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_SPECIAL) | ||||
|      /*
 | ||||
|       * SPECIALBUILD is deprecated. Use PNG_LIBPNG_BUILD_SPECIAL_STRING instead. | ||||
|       */ | ||||
| #    if defined(SPECIALBUILD) && !defined(PNG_LIBPNG_BUILD_SPECIAL_STRING) | ||||
| #      define PNG_LIBPNG_BUILD_SPECIAL_STRING SPECIALBUILD | ||||
| #    else | ||||
| #      if !defined(PNG_LIBPNG_BUILD_SPECIAL_STRING) | ||||
| #         error "PNG_LIBPNG_BUILD_SPECIAL_STRING must be defined \ | ||||
|           if PNG_LIBPNG_BUILD_SPECIAL is set" | ||||
| #      endif | ||||
| #    endif | ||||
| #  endif | ||||
| #endif | ||||
| /* End of material added to libpng-1.2.8 */ | ||||
| 
 | ||||
| #endif /* PNGCONF_H */ | ||||
| 
 | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngerror.c - stub functions for i/o and memory allocation
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
| @ -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.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * Copyright (c) 1998, Intel Corporation | ||||
|  | ||||
							
								
								
									
										2
									
								
								pngget.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pngget.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngget.c - retrieval of values from info struct
 | ||||
|  * | ||||
|  * libpng 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
							
								
								
									
										2
									
								
								pngmem.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pngmem.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngmem.c - stub functions for memory allocation
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngpread.c - read a png file in push mode
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 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.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -805,7 +805,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.8beta4 | ||||
|  * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8beta5 | ||||
|  */ | ||||
| 
 | ||||
| void PNGAPI | ||||
| @ -855,7 +855,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.8beta4 | ||||
|  * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.8beta5 | ||||
|  */ | ||||
| void PNGAPI | ||||
| png_read_image(png_structp png_ptr, png_bytepp image) | ||||
|  | ||||
							
								
								
									
										2
									
								
								pngrio.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pngrio.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngrio.c - functions for data input
 | ||||
|  * | ||||
|  * libpng 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
							
								
								
									
										10
									
								
								pngrtran.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								pngrtran.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngrtran.c - transforms the data in a row for PNG readers
 | ||||
|  * | ||||
|  * libpng version  1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version  1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -119,7 +119,7 @@ void PNGAPI | ||||
| png_set_strip_alpha(png_structp png_ptr) | ||||
| { | ||||
|    png_debug(1, "in png_set_strip_alpha\n"); | ||||
|    png_ptr->transformations |= PNG_STRIP_ALPHA; | ||||
|    png_ptr->flags |= PNG_FLAG_STRIP_ALPHA; | ||||
| } | ||||
| #endif | ||||
| 
 | ||||
| @ -1121,7 +1121,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr) | ||||
|       info_ptr->channels = 1; | ||||
| 
 | ||||
| #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED) | ||||
|    if (png_ptr->transformations & PNG_STRIP_ALPHA) | ||||
|    if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA) | ||||
|       info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA; | ||||
| #endif | ||||
| 
 | ||||
| @ -1209,9 +1209,9 @@ png_do_read_transformations(png_structp png_ptr) | ||||
| #endif | ||||
| 
 | ||||
| #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED) | ||||
|    if (png_ptr->transformations & PNG_STRIP_ALPHA) | ||||
|    if (png_ptr->flags & PNG_FLAG_STRIP_ALPHA) | ||||
|       png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, | ||||
|          PNG_FLAG_FILLER_AFTER,png_ptr->transformations); | ||||
|          PNG_FLAG_FILLER_AFTER | (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)); | ||||
| #endif | ||||
| 
 | ||||
| #if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) | ||||
|  | ||||
| @ -1,6 +1,6 @@ | ||||
| /* pngrutil.c - utilities to read a PNG file
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
							
								
								
									
										2
									
								
								pngset.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pngset.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngset.c - storage of image information into info struct
 | ||||
|  * | ||||
|  * libpng 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 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.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -1551,4 +1551,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_8beta4 your_png_h_is_not_version_1_2_8beta4; | ||||
| typedef version_1_2_8beta5 your_png_h_is_not_version_1_2_8beta5; | ||||
|  | ||||
							
								
								
									
										11
									
								
								pngtrans.c
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								pngtrans.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 | ||||
|  * | ||||
|  * libpng  1.2.8beta4 - November 13, 2004 | ||||
|  * libpng  1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -380,8 +380,7 @@ png_do_packswap(png_row_infop row_info, png_bytep row) | ||||
|     defined(PNG_READ_STRIP_ALPHA_SUPPORTED) | ||||
| /* remove filler or alpha byte(s) */ | ||||
| void /* PRIVATE */ | ||||
| png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags, | ||||
|   png_uint_32 transformations) | ||||
| png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags) | ||||
| { | ||||
|    png_debug(1, "in png_do_strip_filler\n"); | ||||
| #if defined(PNG_USELESS_TESTS_SUPPORTED) | ||||
| @ -395,7 +394,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags, | ||||
| 
 | ||||
|       if ((row_info->color_type == PNG_COLOR_TYPE_RGB || | ||||
|          (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA && | ||||
|          (transformations & PNG_STRIP_ALPHA))) && | ||||
|          (flags & PNG_FLAG_STRIP_ALPHA))) && | ||||
|          row_info->channels == 4) | ||||
|       { | ||||
|          if (row_info->bit_depth == 8) | ||||
| @ -476,7 +475,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags, | ||||
|       } | ||||
|       else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY || | ||||
|          (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA && | ||||
|          (transformations & PNG_STRIP_ALPHA))) && | ||||
|          (flags & PNG_FLAG_STRIP_ALPHA))) && | ||||
|           row_info->channels == 2) | ||||
|       { | ||||
|          if (row_info->bit_depth == 8) | ||||
| @ -530,7 +529,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags, | ||||
|          } | ||||
|          row_info->channels = 1; | ||||
|       } | ||||
|       if (transformations & PNG_STRIP_ALPHA) | ||||
|       if (flags & PNG_FLAG_STRIP_ALPHA) | ||||
|         row_info->color_type &= ~PNG_COLOR_MASK_ALPHA; | ||||
|    } | ||||
| } | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
|  * | ||||
|  * For Intel x86 CPU and Microsoft Visual C++ compiler | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * Copyright (c) 1998, Intel Corporation | ||||
|  | ||||
							
								
								
									
										2
									
								
								pngwio.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pngwio.c
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngwio.c - functions for data output
 | ||||
|  * | ||||
|  * libpng 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngwrite.c - general routines to write a PNG file
 | ||||
|  * | ||||
|  * libpng 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngwtran.c - transforms the data in a row for PNG writers
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
| @ -38,9 +38,10 @@ png_do_write_transformations(png_structp png_ptr) | ||||
|            png_ptr->row_buf + 1);      /* start of pixel data for row */ | ||||
| #endif | ||||
| #if defined(PNG_WRITE_FILLER_SUPPORTED) | ||||
|    if (png_ptr->transformations & PNG_FILLER) | ||||
|    if (png_ptr->transformations & PNG_FILLER || | ||||
|        (png_ptr->flags & PNG_FLAG_STRIP_ALPHA)) | ||||
|       png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1, | ||||
|          png_ptr->flags,png_ptr->transformations); | ||||
|          png_ptr->flags); | ||||
| #endif | ||||
| #if defined(PNG_WRITE_PACKSWAP_SUPPORTED) | ||||
|    if (png_ptr->transformations & PNG_PACKSWAP) | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| 
 | ||||
| /* pngwutil.c - utilities to write a PNG file
 | ||||
|  * | ||||
|  * libpng version 1.2.8beta4 - November 13, 2004 | ||||
|  * libpng version 1.2.8beta5 - November 20, 2004 | ||||
|  * For conditions of distribution and use, see copyright notice in png.h | ||||
|  * Copyright (c) 1998-2004 Glenn Randers-Pehrson | ||||
|  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) | ||||
|  | ||||
| @ -8,7 +8,7 @@ | ||||
| 
 | ||||
| # Modeled after libxml-config. | ||||
| 
 | ||||
| version=1.2.8beta4 | ||||
| version=1.2.8beta5 | ||||
| prefix="" | ||||
| libdir="" | ||||
| libs="" | ||||
|  | ||||
| @ -6,6 +6,6 @@ includedir=${exec_prefix}/include | ||||
| 
 | ||||
| Name: libpng12 | ||||
| Description: Loads and saves PNG files | ||||
| Version: 1.2.8beta4 | ||||
| Version: 1.2.8beta5 | ||||
| Libs: -L${libdir} -lpng12 -lz -lm | ||||
| Cflags: -I${includedir}/libpng12 | ||||
|  | ||||
| @ -33,7 +33,7 @@ RANLIB=echo | ||||
| 
 | ||||
| LIBNAME=libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| INCPATH=$(prefix)/include | ||||
|  | ||||
| @ -33,7 +33,7 @@ RANLIB=echo | ||||
| 
 | ||||
| LIBNAME=libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| INCPATH=$(prefix)/include | ||||
|  | ||||
| @ -18,7 +18,7 @@ RM = rm -f | ||||
| 
 | ||||
| LIBNAME=libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| prefix=/usr/local | ||||
|  | ||||
| @ -12,7 +12,7 @@ ZLIBLIB=/usr/local/lib | ||||
| ZLIBINC=/usr/local/include | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| ALIGN= | ||||
|  | ||||
| @ -79,7 +79,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ | ||||
| LIBNAME = libpng12 | ||||
| PNGMAJ = 0 | ||||
| CYGDLL = 12 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| SHAREDLIB=cygpng$(CYGDLL).dll | ||||
|  | ||||
| @ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz | ||||
| RANLIB=ranlib | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -32,7 +32,7 @@ ZLIBLIB=../zlib | ||||
| ZLIBINC=../zlib | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -15,7 +15,7 @@ | ||||
| 
 | ||||
| LIBNAME = libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| CC=gcc | ||||
|  | ||||
| @ -27,7 +27,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm | ||||
| RANLIB=ranlib | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -41,7 +41,7 @@ RANLIB=ranlib | ||||
| #RANLIB=echo | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm | ||||
| RANLIB=ranlib | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -5,7 +5,7 @@ | ||||
| 
 | ||||
| LIBNAME = libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| CC=gcc | ||||
|  | ||||
| @ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 | ||||
| 
 | ||||
| LIB=	png12 | ||||
| SHLIB_MAJOR=	0 | ||||
| SHLIB_MINOR=	1.2.8beta4 | ||||
| SHLIB_MINOR=	1.2.8beta5 | ||||
| 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 | ||||
|  | ||||
| @ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng | ||||
| 
 | ||||
| LIB=	png | ||||
| SHLIB_MAJOR=	3 | ||||
| SHLIB_MINOR=	1.2.8beta4 | ||||
| SHLIB_MINOR=	1.2.8beta5 | ||||
| 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 | ||||
|  | ||||
| @ -7,7 +7,7 @@ LIBDIR=	${PREFIX}/lib | ||||
| MANDIR= ${PREFIX}/man/cat | ||||
| 
 | ||||
| SHLIB_MAJOR=	0 | ||||
| SHLIB_MINOR=	1.2.8beta4 | ||||
| SHLIB_MINOR=	1.2.8beta5 | ||||
| 
 | ||||
| LIB=	png | ||||
| SRCS=	png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ | ||||
|  | ||||
| @ -24,7 +24,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm | ||||
| RANLIB=echo | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -18,7 +18,7 @@ ZLIBINC=../zlib | ||||
| 
 | ||||
| LIBNAME=libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| CC=gcc | ||||
| 
 | ||||
|  | ||||
| @ -5,7 +5,7 @@ | ||||
| 
 | ||||
| LIBNAME=libpng12 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| 
 | ||||
| # Where make install puts libpng.a, libpng12.so, and libpng12/png.h | ||||
|  | ||||
| @ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm | ||||
| RANLIB=echo | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -30,7 +30,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm | ||||
| RANLIB=echo | ||||
| 
 | ||||
| PNGMAJ = 0 | ||||
| PNGMIN = 1.2.8beta4 | ||||
| PNGMIN = 1.2.8beta5 | ||||
| PNGVER = $(PNGMAJ).$(PNGMIN) | ||||
| LIBNAME = libpng12 | ||||
| 
 | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| ; PNG.LIB module definition file for OS/2 | ||||
| ;---------------------------------------- | ||||
| 
 | ||||
| ; Version 1.2.8beta4 | ||||
| ; Version 1.2.8beta5 | ||||
| 
 | ||||
| LIBRARY		PNG | ||||
| DESCRIPTION	"PNG image compression library for OS/2" | ||||
|  | ||||
| @ -6,7 +6,7 @@ LIBRARY | ||||
| DESCRIPTION "PNG image compression library for Windows" | ||||
| 
 | ||||
| EXPORTS | ||||
| ;Version 1.2.8beta4 | ||||
| ;Version 1.2.8beta5 | ||||
|   png_build_grayscale_palette  @1 | ||||
|   png_check_sig        @2 | ||||
|   png_chunk_error      @3 | ||||
|  | ||||
| @ -52,7 +52,7 @@ standard library | ||||
| #  define VS_SPECIALBUILD 0 | ||||
| #endif /* PNG_LIBPNG_BUILD_SPECIAL */ | ||||
| 
 | ||||
| #if ((PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_TYPEMASK) != \ | ||||
| #if ((PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_RELEASE_STATUS_MASK) != \ | ||||
|       PNG_LIBPNG_BUILD_STABLE) | ||||
| #  define VS_PRERELEASE VS_FF_PRERELEASE | ||||
| #  define VS_PATCHED 0 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Glenn Randers-Pehrson
						Glenn Randers-Pehrson