diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 23:22:47 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 23:22:47 +0000 |
| commit | 3e2f52c914d317e045b779eeb9a9241a763b6db4 (patch) | |
| tree | aeb78406fb9c2c1365bada313ee02bb3441a1c7d /third_party/libpng/pngerror.c | |
| parent | 2996231cee980f67ec8c0b10d12fda9599521062 (diff) | |
| download | chromium_src-3e2f52c914d317e045b779eeb9a9241a763b6db4.zip chromium_src-3e2f52c914d317e045b779eeb9a9241a763b6db4.tar.gz chromium_src-3e2f52c914d317e045b779eeb9a9241a763b6db4.tar.bz2 | |
This updates the PNG library to 1.2.37, which fixes some bugs internal to the PNG library, and it turns on some functionality that O3D needs for manipulating PNG files: It removes the definition of PNG_NO_WRITE_FILLER, PNG_NO_READ_FILLER, PNG_NO_SEQUENTIAL_READ_SUPPORTED, and PNG_NO_INFO_IMAGE from pngusr.h so that the functions used by O3D to read images progressively and for filler bytes for pixel expansion (RGB -> RGBX) are available.
BUG=none
TEST=successful trybot run for all platforms.
Review URL: http://codereview.chromium.org/140074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/pngerror.c')
| -rw-r--r-- | third_party/libpng/pngerror.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/third_party/libpng/pngerror.c b/third_party/libpng/pngerror.c index b85ee11..71a2e53 100644 --- a/third_party/libpng/pngerror.c +++ b/third_party/libpng/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.36 [May 7, 2009] + * Last changed in libpng 1.2.37 [June 4, 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) @@ -234,9 +234,11 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) fprintf(stderr, PNG_STRING_NEWLINE); } else + { fprintf(stderr, "libpng error: %s, offset=%d", error_message, offset); fprintf(stderr, PNG_STRING_NEWLINE); + } } else #endif @@ -263,7 +265,7 @@ png_default_error(png_structp png_ptr, png_const_charp error_message) PNG_ABORT(); #endif #ifdef PNG_NO_CONSOLE_IO - error_message = error_message; /* make compiler happy */ + error_message = error_message; /* Make compiler happy */ #endif } @@ -309,9 +311,9 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message) fprintf(stderr, PNG_STRING_NEWLINE); } #else - warning_message = warning_message; /* make compiler happy */ + warning_message = warning_message; /* Make compiler happy */ #endif - png_ptr = png_ptr; /* make compiler happy */ + png_ptr = png_ptr; /* Make compiler happy */ } #endif /* PNG_NO_WARNINGS */ |