| Index: third_party/libjpeg/fpdfapi_jdmerge.c
|
| diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c
|
| index c229f86aa532ac2d05fb80a6e21cf83b52804b37..519bbad685388b5d4c383bc485880748cd502e88 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_
|
|
|