diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-03-31 13:33:12 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-31 20:51:48 +0000 |
| commit | a2af7de2e32e6938dd825acb8df775b11ec95510 (patch) | |
| tree | 883664ee920a8fd64dbc96bec8cb59fe1c7ce760 /third_party/libtiff | |
| parent | bdbb0bd92bfca52e574106c4ce5f93d9d34d3373 (diff) | |
| download | pdfium-a2af7de2e32e6938dd825acb8df775b11ec95510.tar.xz | |
Move zlib to a DEPS-based checkout.
BUG=chromium:541704
Change-Id: I313d8853450ff5940b3baa4054ff441b342c46b7
Reviewed-on: https://pdfium-review.googlesource.com/3350
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff')
| -rw-r--r-- | third_party/libtiff/0000-build-config.patch | 24 | ||||
| -rw-r--r-- | third_party/libtiff/tif_pixarlog.c | 2 | ||||
| -rw-r--r-- | third_party/libtiff/tif_zip.c | 2 |
3 files changed, 2 insertions, 26 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch index 28c62f9eea..a422b37db8 100644 --- a/third_party/libtiff/0000-build-config.patch +++ b/third_party/libtiff/0000-build-config.patch @@ -65,30 +65,6 @@ diff a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c typedef struct jpeg_error_mgr jpeg_error_mgr; typedef struct jpeg_common_struct jpeg_common_struct; -diff a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c ---- a/third_party/libtiff/tif_pixarlog.c -+++ b/third_party/libtiff/tif_pixarlog.c -@@ -90,7 +90,7 @@ - */ - - #include "tif_predict.h" --#include "zlib.h" -+#include "../zlib_v1211/zlib.h" - - #include <stdio.h> - #include <stdlib.h> -diff a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c ---- a/third_party/libtiff/tif_zip.c -+++ b/third_party/libtiff/tif_zip.c -@@ -47,7 +47,7 @@ - * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz. - */ - #include "tif_predict.h" --#include "zlib.h" -+#include "../zlib_v1211/zlib.h" - - #include <stdio.h> - diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h --- /dev/null +++ b/third_party/libtiff/tiffconf.h diff --git a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c index e6574ec3df..c2903bffef 100644 --- a/third_party/libtiff/tif_pixarlog.c +++ b/third_party/libtiff/tif_pixarlog.c @@ -90,7 +90,7 @@ */ #include "tif_predict.h" -#include "../zlib_v1211/zlib.h" +#include "zlib.h" #include <stdio.h> #include <stdlib.h> diff --git a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c index 0625bf179f..8c35aea83d 100644 --- a/third_party/libtiff/tif_zip.c +++ b/third_party/libtiff/tif_zip.c @@ -47,7 +47,7 @@ * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz. */ #include "tif_predict.h" -#include "../zlib_v1211/zlib.h" +#include "zlib.h" #include <stdio.h> |