diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 17:36:44 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 17:36:44 +0000 |
| commit | e190d278f442261c259584ece6d80de4a0ef679c (patch) | |
| tree | ea95eb56876fc68837b40416a988fd7d96799fb8 /ui/gfx/codec/jpeg_codec.cc | |
| parent | c42817c40633311aae8244eaa967c3c98550ba04 (diff) | |
| download | chromium_src-e190d278f442261c259584ece6d80de4a0ef679c.zip chromium_src-e190d278f442261c259584ece6d80de4a0ef679c.tar.gz chromium_src-e190d278f442261c259584ece6d80de4a0ef679c.tar.bz2 | |
Add checks in the code so that we can guarantee that we are using the correct library as specified via common.gypi
BUG=144296
Review URL: https://chromiumcodereview.appspot.com/10886050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/codec/jpeg_codec.cc')
| -rw-r--r-- | ui/gfx/codec/jpeg_codec.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc index a58756b..6836143 100644 --- a/ui/gfx/codec/jpeg_codec.cc +++ b/ui/gfx/codec/jpeg_codec.cc @@ -14,8 +14,10 @@ extern "C" { #if defined(USE_SYSTEM_LIBJPEG) #include <jpeglib.h> +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jpeglib.h" #else -#include "jpeglib.h" +#include "third_party/libjpeg/jpeglib.h" #endif } |