diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-10 13:20:33 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-10 13:20:33 -0800 |
| commit | fb1cd014b48942572fe49bf2739ad7550a3a6bce (patch) | |
| tree | 7706af8ae631190209cea3afaccef6de2c494a2b /third_party/libjpeg/fpdfapi_jdmerge.c | |
| parent | 888ec9f3ef5c199f657bbd33a5c8244e02105969 (diff) | |
| download | pdfium-fb1cd014b48942572fe49bf2739ad7550a3a6bce.tar.xz | |
Merge to XFA: Get rid of _FX_JPEG_TURBO_
Instead, set the libjpeg to use via GYP/GN.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1433803002 .
(cherry picked from commit 16f26fb7621c8ee554f4d7c5b4c1972eb0ed7065)
Review URL: https://codereview.chromium.org/1409323010 .
Diffstat (limited to 'third_party/libjpeg/fpdfapi_jdmerge.c')
| -rw-r--r-- | third_party/libjpeg/fpdfapi_jdmerge.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c index c229f86aa5..519bbad685 100644 --- a/third_party/libjpeg/fpdfapi_jdmerge.c +++ b/third_party/libjpeg/fpdfapi_jdmerge.c @@ -1,4 +1,3 @@ -#if !defined(_FX_JPEG_TURBO_) /* * jdmerge.c * @@ -402,5 +401,3 @@ jinit_merged_upsampler (j_decompress_ptr cinfo) } #endif /* UPSAMPLE_MERGING_SUPPORTED */ - -#endif //_FX_JPEG_TURBO_ |