From a2af7de2e32e6938dd825acb8df775b11ec95510 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 31 Mar 2017 13:33:12 -0700 Subject: Move zlib to a DEPS-based checkout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=chromium:541704 Change-Id: I313d8853450ff5940b3baa4054ff441b342c46b7 Reviewed-on: https://pdfium-review.googlesource.com/3350 Commit-Queue: Lei Zhang Reviewed-by: dsinclair Reviewed-by: Nicolás Peña --- third_party/libtiff/0000-build-config.patch | 24 ------------------------ third_party/libtiff/tif_pixarlog.c | 2 +- third_party/libtiff/tif_zip.c | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) (limited to 'third_party/libtiff') 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 - #include -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 - 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 #include 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 -- cgit v1.2.3