diff --git a/ANNOUNCE b/ANNOUNCE index 14ff8b436..96f6bb834 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.4beta05 - August 3, 2010 +Libpng 1.4.4beta05 - August 4, 2010 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. @@ -49,7 +49,9 @@ version 1.4.4beta03 [July 24, 2010] version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. -version 1.4.4beta05 [August 3, 2010] +version 1.4.4beta05 [August 4, 2010] + Updated projects/visualc71 so it can find scripts/pnglibconf.h + Removed unused png_mem_* defines from pngconf.h. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c3c676e37..c303dac8b 100644 --- a/CHANGES +++ b/CHANGES @@ -2633,7 +2633,9 @@ version 1.4.4beta03 [July 24, 2010] version 1.4.4beta04 [July 31, 2010] Updated the read macros and functions from 1.5.0beta38. -version 1.4.4beta05 [August 3, 2010] +version 1.4.4beta05 [August 4, 2010] + Updated projects/visualc71 so it can find scripts/pnglibconf.h + Removed unused png_mem_* defines from pngconf.h. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngconf.h b/pngconf.h index 4ecb58430..819f665d4 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.4beta05 - August 3, 2010 + * libpng version 1.4.4beta05 - August 4, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -269,11 +269,19 @@ * #define PNG_NO_STDIO */ +#ifdef _WIN32_WCE +# define PNG_NO_CONSOLE_IO +# define PNG_NO_STDIO +# define PNG_NO_TIME_RFC1123 +# ifdef PNG_DEBUG +# undef PNG_DEBUG +# endif +#endif + #if !defined(PNG_NO_STDIO) && !defined(PNG_STDIO_SUPPORTED) # define PNG_STDIO_SUPPORTED #endif - #ifdef PNG_BUILD_DLL # if !defined(PNG_CONSOLE_IO_SUPPORTED) && !defined(PNG_NO_CONSOLE_IO) # define PNG_NO_CONSOLE_IO @@ -1420,10 +1428,14 @@ typedef char FAR * FAR * FAR * png_charppp; /* memory model/platform independent fns */ #ifndef PNG_ABORT -# ifdef _WINDOWS_ -# define PNG_ABORT() ExitProcess(0) +# ifdef _WIN32_WCE +# define PNG_ABORT() exit(-1) # else -# define PNG_ABORT() abort() +# ifdef _WINDOWS_ +# define PNG_ABORT() ExitProcess(0) +# else +# define PNG_ABORT() abort() +# endif # endif #endif @@ -1497,22 +1509,14 @@ typedef char FAR * FAR * FAR * png_charppp; * to encounter practical situations that require such conversions. */ #if defined(__TURBOC__) && !defined(__FLAT__) -# define png_mem_alloc farmalloc -# define png_mem_free farfree typedef unsigned long png_alloc_size_t; #else # if defined(_MSC_VER) && defined(MAXSEG_64K) -# define png_mem_alloc(s) halloc(s, 1) -# define png_mem_free hfree typedef unsigned long png_alloc_size_t; # else # if defined(_WINDOWS_) && (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL) -# define png_mem_alloc(s) HeapAlloc(GetProcessHeap(), 0, s) -# define png_mem_free(p) HeapFree(GetProcessHeap(), 0, p) typedef DWORD png_alloc_size_t; # else -# define png_mem_alloc malloc -# define png_mem_free free typedef png_size_t png_alloc_size_t; # endif # endif