diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 18:59:05 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 18:59:05 +0000 |
| commit | 8dfa2d9cd1f3aee9ec5df6734e7f57c755c4cc09 (patch) | |
| tree | 53626e6e4fc577aeebf05956dbab85f66e8b2def /third_party/libpng | |
| parent | b1d4002af4c97a29ac60bef14d6c437c0b28cc9b (diff) | |
| download | chromium_src-8dfa2d9cd1f3aee9ec5df6734e7f57c755c4cc09.zip chromium_src-8dfa2d9cd1f3aee9ec5df6734e7f57c755c4cc09.tar.gz chromium_src-8dfa2d9cd1f3aee9ec5df6734e7f57c755c4cc09.tar.bz2 | |
Allow PNG_EASY_ACCESS_SUPPORTED by not defining PNG_NO_EASY_ACCESS. This
enables [wk_]png_get_image_width, [wk_]png_get_image_height, and
[wk_]png_get_interlace_type, required for
https://bugs.webkit.org/show_bug.cgi?id=54406.
This is needed to allow WebKit to build with libpng 1.5, which no longer allows
direct access to the underlying struct members without using the "easy access"
accessors.
BUG=webkit:54406
TEST=That patch can land without breaking Chromium
Review URL: http://codereview.chromium.org/6708113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng')
| -rw-r--r-- | third_party/libpng/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/libpng/pngusr.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/third_party/libpng/README.chromium b/third_party/libpng/README.chromium index 734df9e..1e0b090 100644 --- a/third_party/libpng/README.chromium +++ b/third_party/libpng/README.chromium @@ -5,8 +5,7 @@ Version: 1.2.44 Description: Our custom configuration options are defined in pngusr.h. This was previously called mozpngconf.h, which was copied from Mozilla and modified by Apple (hence -the webkit_* names). +the wk_* names). Updated to 1.2.44, no changes to the source files but all unneeded files stripped. - diff --git a/third_party/libpng/pngusr.h b/third_party/libpng/pngusr.h index f2446e1..06a6c15 100644 --- a/third_party/libpng/pngusr.h +++ b/third_party/libpng/pngusr.h @@ -114,7 +114,7 @@ #define PNG_NO_CONSOLE_IO #define PNG_NO_ZALLOC_ZERO #define PNG_NO_ERROR_NUMBERS -#define PNG_NO_EASY_ACCESS +#undef PNG_NO_EASY_ACCESS #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS #define PNG_NO_TIME_RFC1123 |