diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:58:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:58:12 +0000 |
| commit | ed517f39f6664c1c6ab0db0385176efa3b8f8e05 (patch) | |
| tree | 6989a8513ca357b3894298da0c5bafe7da13bd2f /base/gfx | |
| parent | 1ed38c7a8e30647e1bc5c0aa857dd1ca8e8a3154 (diff) | |
| download | chromium_src-ed517f39f6664c1c6ab0db0385176efa3b8f8e05.zip chromium_src-ed517f39f6664c1c6ab0db0385176efa3b8f8e05.tar.gz chromium_src-ed517f39f6664c1c6ab0db0385176efa3b8f8e05.tar.bz2 | |
Linux: add GYP flag to build with system jpeg.
This follows the general style of r21663, which we agreed was the way
to do this.
http://codereview.chromium.org/164080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx')
| -rw-r--r-- | base/gfx/jpeg_codec.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/gfx/jpeg_codec.cc b/base/gfx/jpeg_codec.cc index f2e82c2..4aea077 100644 --- a/base/gfx/jpeg_codec.cc +++ b/base/gfx/jpeg_codec.cc @@ -11,7 +11,11 @@ #include "third_party/skia/include/core/SkBitmap.h" extern "C" { +#if defined(USE_SYSTEM_LIBJPEG) +#include <jpeglib.h> +#else #include "third_party/libjpeg/jpeglib.h" +#endif } // Encoder/decoder shared stuff ------------------------------------------------ |