diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 20:30:14 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 20:30:14 +0000 |
| commit | 497fbb5a93a56a9a1a0e87cdd67ee957b5ecdb86 (patch) | |
| tree | c01e17a9c1d47e147787468d19c342825df84100 /third_party/libpng/pngconf.h | |
| parent | 2778def9d0245d1629cf77a6c35cf2ff7d452c83 (diff) | |
| download | chromium_src-497fbb5a93a56a9a1a0e87cdd67ee957b5ecdb86.zip chromium_src-497fbb5a93a56a9a1a0e87cdd67ee957b5ecdb86.tar.gz chromium_src-497fbb5a93a56a9a1a0e87cdd67ee957b5ecdb86.tar.bz2 | |
Update libpng to 1.2.35.
Review URL: http://codereview.chromium.org/27005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/pngconf.h')
| -rw-r--r-- | third_party/libpng/pngconf.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/third_party/libpng/pngconf.h b/third_party/libpng/pngconf.h index e9423be..834f7e7 100644 --- a/third_party/libpng/pngconf.h +++ b/third_party/libpng/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 */ |