tree 46efd7c7a0b65c37b97883593cf96ff7e74034d8
parent 8de794b1d52de9313b9c617ad1c04ec89036dbe3
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 1257560265 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 1257560265 +0000

third_party/libpng/pngusr.h renames the various png_* functions to webkit_png_*; however, it missed one: png_write_destroy.  This change adds renaming for that function.

The file _does_ rename png_read_destroy, as well as other png_write_* functions, so the omission would seem to be an oversight (presumably going back to WebKit) rather than a deliberate choice.  Since browers don't generally need to write PNGs, this probably hasn't caused problems before.  However, it is causing problems for me now because I am trying to write a Firefox plugin that links in (among other things) the Chromium libpng; because neither Firefox nor Chromium renames the png_write_destroy function, there is a conflict between Firefox's libpng and the one I'm trying to link in.  This patch solves the issue for me.

BUG=none
TEST=none

Patch contributed by Matthew Steele

Review URL: http://codereview.chromium.org/374016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31359 0039d316-1c4b-4281-b951-d872f2087c98