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/pngusr.h | |
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/pngusr.h')
-rw-r--r-- | third_party/libpng/pngusr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/libpng/pngusr.h b/third_party/libpng/pngusr.h index f3f4b6e..d4a2d68 100644 --- a/third_party/libpng/pngusr.h +++ b/third_party/libpng/pngusr.h @@ -39,14 +39,14 @@ #define PNG_NO_GLOBAL_ARRAYS -#define PNG_NO_INFO_IMAGE +#undef PNG_NO_INFO_IMAGE #define PNG_NO_READ_BACKGROUND #define PNG_NO_READ_DITHER #define PNG_NO_READ_INVERT #define PNG_NO_READ_SHIFT #define PNG_NO_READ_PACK #define PNG_NO_READ_PACKSWAP -#define PNG_NO_READ_FILLER +#undef PNG_NO_READ_FILLER #define PNG_NO_READ_SWAP_ALPHA #define PNG_NO_READ_INVERT_ALPHA #define PNG_NO_READ_RGB_TO_GRAY @@ -77,7 +77,7 @@ #define PNG_NO_WRITE_SHIFT #define PNG_NO_WRITE_PACK #define PNG_NO_WRITE_PACKSWAP -#define PNG_NO_WRITE_FILLER +#undef PNG_NO_WRITE_FILLER #define PNG_NO_WRITE_SWAP_ALPHA #define PNG_NO_WRITE_INVERT_ALPHA #define PNG_NO_WRITE_RGB_TO_GRAY @@ -110,7 +110,7 @@ #define PNG_NO_ERROR_NUMBERS #define PNG_NO_EASY_ACCESS -#define PNG_NO_SEQUENTIAL_READ_SUPPORTED +#undef PNG_NO_SEQUENTIAL_READ_SUPPORTED /* Mangle names of exported libpng functions so different libpng versions can coexist. It is recommended that if you do this, you give your |