diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-10 13:16:37 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-10 13:16:37 -0800 |
| commit | 888ec9f3ef5c199f657bbd33a5c8244e02105969 (patch) | |
| tree | d7e6edbb3b7852c9caf4dc09ef470b9522c8e29c /third_party | |
| parent | 61aad4fbb6fb1081a40b2e144106f57cf443846c (diff) | |
| download | pdfium-888ec9f3ef5c199f657bbd33a5c8244e02105969.tar.xz | |
XFA: Fix libjpeg header includes.
BUG=pdfium:272
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1414043014 .
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/tiff_v403/tif_jpeg.c | 15 | ||||
| -rw-r--r-- | third_party/tiff_v403/tif_ojpeg.c | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/third_party/tiff_v403/tif_jpeg.c b/third_party/tiff_v403/tif_jpeg.c index 3c2998b915..d6f37dfce3 100644 --- a/third_party/tiff_v403/tif_jpeg.c +++ b/third_party/tiff_v403/tif_jpeg.c @@ -84,13 +84,16 @@ int TIFFReInitJPEG_12( TIFF *tif, int scheme, int is_encode ); # define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #endif -#ifndef _FX_JPEG_TURBO_ - #include "../libjpeg/jpeglib.h" - #include "../libjpeg/jerror.h" +#if defined(USE_SYSTEM_LIBJPEG) +#include <jerror.h> +#include <jpeglib.h> +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jerror.h" +#include "third_party/libjpeg_turbo/jpeglib.h" #else - #include "../libjpeg-turbo/jpeglib.h" - #include "../libjpeg-turbo/jerror.h" -#endif//_FX_JPEG_TURBO_ +#include "third_party/libjpeg/jerror.h" +#include "third_party/libjpeg/jpeglib.h" +#endif /* * Do we want to do special processing suitable for when JSAMPLE is a diff --git a/third_party/tiff_v403/tif_ojpeg.c b/third_party/tiff_v403/tif_ojpeg.c index 281c8e13cd..0a774a526e 100644 --- a/third_party/tiff_v403/tif_ojpeg.c +++ b/third_party/tiff_v403/tif_ojpeg.c @@ -215,13 +215,13 @@ static const TIFFField ojpegFields[] = { # define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #endif -#ifndef _FX_JPEG_TURBO_ - #include "../libjpeg/jpeglib.h" - #include "../libjpeg/jerror.h" +#if defined(USE_SYSTEM_LIBJPEG) +#include <jpeglib.h> +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jpeglib.h" #else - #include "../libjpeg-turbo/jpeglib.h" - #include "../libjpeg-turbo/jerror.h" -#endif//_FX_JPEG_TURBO_ +#include "third_party/libjpeg/jpeglib.h" +#endif typedef struct jpeg_error_mgr jpeg_error_mgr; typedef struct jpeg_common_struct jpeg_common_struct; |