mirror of
				https://git.code.sf.net/p/libpng/code.git
				synced 2025-07-10 18:04:09 +02:00 
			
		
		
		
	[devel] Bump version to 1.4.0rc05
This commit is contained in:
		
							parent
							
								
									dbcfb7151f
								
							
						
					
					
						commit
						70529c3b40
					
				
							
								
								
									
										6
									
								
								png.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								png.c
									
									
									
									
									
								
							@ -17,7 +17,7 @@
 | 
			
		||||
#include "pngpriv.h"
 | 
			
		||||
 | 
			
		||||
/* Generate a compiler error if there is an old png.h in the search path. */
 | 
			
		||||
typedef version_1_4_0rc04 Your_png_h_is_not_version_1_4_0rc04;
 | 
			
		||||
typedef version_1_4_0rc05 Your_png_h_is_not_version_1_4_0rc05;
 | 
			
		||||
 | 
			
		||||
/* Version information for C files.  This had better match the version
 | 
			
		||||
 * string defined in png.h.
 | 
			
		||||
@ -548,13 +548,13 @@ png_get_copyright(png_structp png_ptr)
 | 
			
		||||
#else
 | 
			
		||||
#ifdef __STDC__
 | 
			
		||||
   return ((png_charp) PNG_STRING_NEWLINE \
 | 
			
		||||
     "libpng version 1.4.0rc04 - December 25, 2009" PNG_STRING_NEWLINE \
 | 
			
		||||
     "libpng version 1.4.0rc05 - December 25, 2009" PNG_STRING_NEWLINE \
 | 
			
		||||
     "Copyright (c) 1998-2009 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
 | 
			
		||||
     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
 | 
			
		||||
     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
 | 
			
		||||
     PNG_STRING_NEWLINE);
 | 
			
		||||
#else
 | 
			
		||||
      return ((png_charp) "libpng version 1.4.0rc04 - December 25, 2009\
 | 
			
		||||
      return ((png_charp) "libpng version 1.4.0rc05 - December 25, 2009\
 | 
			
		||||
      Copyright (c) 1998-2009 Glenn Randers-Pehrson\
 | 
			
		||||
      Copyright (c) 1996-1997 Andreas Dilger\
 | 
			
		||||
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										18
									
								
								png.h
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								png.h
									
									
									
									
									
								
							@ -1,7 +1,7 @@
 | 
			
		||||
 | 
			
		||||
/* png.h - header file for PNG reference library
 | 
			
		||||
 *
 | 
			
		||||
 * libpng version 1.4.0rc04 - December 25, 2009
 | 
			
		||||
 * libpng version 1.4.0rc05 - December 25, 2009
 | 
			
		||||
 * Copyright (c) 1998-2009 Glenn Randers-Pehrson
 | 
			
		||||
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 | 
			
		||||
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
 | 
			
		||||
@ -11,7 +11,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.4.0rc04 - December 25, 2009: Glenn
 | 
			
		||||
 *  libpng versions 0.97, January 1998, through 1.4.0rc05 - December 25, 2009: Glenn
 | 
			
		||||
 *  See also "Contributing Authors", below.
 | 
			
		||||
 *
 | 
			
		||||
 * Note about libpng version numbers:
 | 
			
		||||
@ -132,7 +132,7 @@
 | 
			
		||||
 *    1.4.0beta37-87          14    10400  14.so.14.0[.0]
 | 
			
		||||
 *    1.4.0rc01               14    10400  14.so.14.0[.0]
 | 
			
		||||
 *    1.4.0beta88-109         14    10400  14.so.14.0[.0]
 | 
			
		||||
 *    1.4.0rc02-04            14    10400  14.so.14.0[.0]
 | 
			
		||||
 *    1.4.0rc02-05            14    10400  14.so.14.0[.0]
 | 
			
		||||
 *    1.4.0                   14    10400  14.so.14.0[.0]
 | 
			
		||||
 *
 | 
			
		||||
 *    Henceforth the source version will match the shared-library major
 | 
			
		||||
@ -165,7 +165,7 @@
 | 
			
		||||
 *
 | 
			
		||||
 * This code is released under the libpng license.
 | 
			
		||||
 *
 | 
			
		||||
 * libpng versions 1.2.6, August 15, 2004, through 1.4.0rc04, December 25, 2009, are
 | 
			
		||||
 * libpng versions 1.2.6, August 15, 2004, through 1.4.0rc05, December 25, 2009, are
 | 
			
		||||
 * Copyright (c) 2004, 2006-2007 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:
 | 
			
		||||
@ -283,7 +283,7 @@
 | 
			
		||||
 *    an official declaration.
 | 
			
		||||
 *
 | 
			
		||||
 *    This is your unofficial assurance that libpng from version 0.71 and
 | 
			
		||||
 *    upward through 1.4.0rc04 are Y2K compliant.  It is my belief that earlier
 | 
			
		||||
 *    upward through 1.4.0rc05 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
 | 
			
		||||
@ -339,9 +339,9 @@
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/* Version information for png.h - this should match the version in png.c */
 | 
			
		||||
#define PNG_LIBPNG_VER_STRING "1.4.0rc04"
 | 
			
		||||
#define PNG_LIBPNG_VER_STRING "1.4.0rc05"
 | 
			
		||||
#define PNG_HEADER_VERSION_STRING \
 | 
			
		||||
   " libpng version 1.4.0rc04 - December 25, 2009\n"
 | 
			
		||||
   " libpng version 1.4.0rc05 - December 25, 2009\n"
 | 
			
		||||
 | 
			
		||||
#define PNG_LIBPNG_VER_SONUM   14
 | 
			
		||||
#define PNG_LIBPNG_VER_DLLNUM  14
 | 
			
		||||
@ -354,7 +354,7 @@
 | 
			
		||||
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#define PNG_LIBPNG_VER_BUILD  04
 | 
			
		||||
#define PNG_LIBPNG_VER_BUILD  05
 | 
			
		||||
 | 
			
		||||
/* Release Status */
 | 
			
		||||
#define PNG_LIBPNG_BUILD_ALPHA    1
 | 
			
		||||
@ -1343,7 +1343,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_4_0rc04;
 | 
			
		||||
typedef png_structp version_1_4_0rc05;
 | 
			
		||||
 | 
			
		||||
typedef png_struct FAR * FAR * png_structpp;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
 | 
			
		||||
/* pngconf.h - machine configurable file for libpng
 | 
			
		||||
 *
 | 
			
		||||
 * libpng version 1.4.0rc04 - December 25, 2009
 | 
			
		||||
 * libpng version 1.4.0rc05 - December 25, 2009
 | 
			
		||||
 * For conditions of distribution and use, see copyright notice in png.h
 | 
			
		||||
 * Copyright (c) 1998-2009 Glenn Randers-Pehrson
 | 
			
		||||
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 | 
			
		||||
 | 
			
		||||
@ -1,7 +1,7 @@
 | 
			
		||||
 | 
			
		||||
/* pngpriv.h - private declarations for use inside libpng
 | 
			
		||||
 *
 | 
			
		||||
 * libpng version 1.4.0rc04 - December 25, 2009
 | 
			
		||||
 * libpng version 1.4.0rc05 - December 25, 2009
 | 
			
		||||
 * For conditions of distribution and use, see copyright notice in png.h
 | 
			
		||||
 * Copyright (c) 1998-2009 Glenn Randers-Pehrson
 | 
			
		||||
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user