diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-03-14 14:37:51 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-03-14 14:37:51 +0000 |
| commit | 7c32ec2b945328b079d10987745150b5d29155a4 (patch) | |
| tree | f131237e807f23a4c7eabeb14729e74a6720ca3e /png/pngconf.h | |
| parent | 26c355b6a083e8fe1599705c69130db49b2a565d (diff) | |
Updated the bundled libpng to v1.2.35 (released 18 Feb. 2009)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6684 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'png/pngconf.h')
| -rw-r--r-- | png/pngconf.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/png/pngconf.h b/png/pngconf.h index 05995f308..834f7e704 100644 --- a/png/pngconf.h +++ b/png/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.33 - October 31, 2008 + * libpng version 1.2.35 - February 14, 2009 * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2008 Glenn Randers-Pehrson + * 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.) */ @@ -233,6 +233,8 @@ # include <windows.h> /* Console I/O functions are not supported on WindowsCE */ # define PNG_NO_CONSOLE_IO + /* abort() may not be supported on some/all Windows CE platforms */ +# define PNG_ABORT() exit(-1) # ifdef PNG_DEBUG # undef PNG_DEBUG # endif @@ -798,6 +800,12 @@ # define PNG_USER_HEIGHT_MAX 1000000L #endif + +/* Added at libpng-1.2.34 and 1.4.0 */ +#ifndef PNG_STRING_NEWLINE +#define PNG_STRING_NEWLINE "\n" +#endif + /* These are currently experimental features, define them if you want */ /* very little testing */ @@ -1123,10 +1131,10 @@ typedef unsigned char png_byte; change (I'm not sure if you will or not, so I thought I'd be safe) */ #ifdef PNG_SIZE_T typedef PNG_SIZE_T png_size_t; -# define png_sizeof(x) png_convert_size(sizeof (x)) +# define png_sizeof(x) png_convert_size(sizeof(x)) #else typedef size_t png_size_t; -# define png_sizeof(x) sizeof (x) +# define png_sizeof(x) sizeof(x) #endif /* The following is needed for medium model support. It cannot be in the |