diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 00:43:33 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 00:43:33 +0000 |
| commit | 7e43da7c595c0ab9c7089477bb52bbf6ab421c81 (patch) | |
| tree | efa7722ab5b6d23488b42f61a9be4d7db8922ad5 /third_party/libjpeg/jpeglib.h | |
| parent | f28fbdb03c984d8d7edee21b7a4bae5a700669e2 (diff) | |
| download | chromium_src-7e43da7c595c0ab9c7089477bb52bbf6ab421c81.zip chromium_src-7e43da7c595c0ab9c7089477bb52bbf6ab421c81.tar.gz chromium_src-7e43da7c595c0ab9c7089477bb52bbf6ab421c81.tar.bz2 | |
Mangle the names of the libjpeg functions so gtk/gdk doesn't try to use our libjpeg.
TEST=along with <http://codereview.chromium.org/151100>, it's possible to preview jpeg images
BUG=none
Review URL: http://codereview.chromium.org/151163
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjpeg/jpeglib.h')
| -rw-r--r-- | third_party/libjpeg/jpeglib.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/libjpeg/jpeglib.h b/third_party/libjpeg/jpeglib.h index d1be8dd..668beb6 100644 --- a/third_party/libjpeg/jpeglib.h +++ b/third_party/libjpeg/jpeglib.h @@ -13,6 +13,10 @@ #ifndef JPEGLIB_H #define JPEGLIB_H +/* Begin chromium edits */ +#include "jpeglibmangler.h" +/* End chromium edits */ + /* * First we include the configuration files that record how this * installation of the JPEG library is set up. jconfig.h can be |