diff options
author | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
commit | 8241df7edc53b8777e7f71ff379fa53f368c3a28 (patch) | |
tree | 418c3950809d05c00fad9a39a30e1d324e68cb8b /core/src/fxcodec/codec/fx_codec_jpeg.cpp | |
parent | de383c5d8c0b418a5d5b55d5a4ead715e69255c5 (diff) | |
download | pdfium-8241df7edc53b8777e7f71ff379fa53f368c3a28.tar.xz |
Merge to XFA: Fix all relative includes to third_party.
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
- And fix XFA's lack of #includes.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
(cherry picked from commit 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c)
Review URL: https://codereview.chromium.org/1434543003 .
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_jpeg.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index b3cd2c72e3..78ed013b0b 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -13,7 +13,13 @@ extern "C" { #undef FAR -#include "../../../../third_party/libjpeg/jpeglib.h" +#if defined(USE_SYSTEM_LIBJPEG) +#include <jpeglib.h> +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jpeglib.h" +#else +#include "third_party/libjpeg/jpeglib.h" +#endif } extern "C" { |