summaryrefslogtreecommitdiff
path: root/third_party/libjpeg/fpdfapi_jdmainct.c
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-10 13:20:33 -0800
committerLei Zhang <thestig@chromium.org>2015-11-10 13:20:33 -0800
commitfb1cd014b48942572fe49bf2739ad7550a3a6bce (patch)
tree7706af8ae631190209cea3afaccef6de2c494a2b /third_party/libjpeg/fpdfapi_jdmainct.c
parent888ec9f3ef5c199f657bbd33a5c8244e02105969 (diff)
downloadpdfium-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_jdmainct.c')
-rw-r--r--third_party/libjpeg/fpdfapi_jdmainct.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/third_party/libjpeg/fpdfapi_jdmainct.c b/third_party/libjpeg/fpdfapi_jdmainct.c
index 1483e6fff0..13c956f5de 100644
--- a/third_party/libjpeg/fpdfapi_jdmainct.c
+++ b/third_party/libjpeg/fpdfapi_jdmainct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmainct.c
*
@@ -511,5 +510,3 @@ jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
(JDIMENSION) (rgroup * ngroups));
}
}
-
-#endif //_FX_JPEG_TURBO_