summaryrefslogtreecommitdiff
path: root/third_party/libtiff
diff options
context:
space:
mode:
authorAdenilson Cavalcanti <adenilson.cavalcanti@arm.com>2017-03-23 11:04:40 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-27 14:27:21 +0000
commit8e3f692b03e97659e855be4ea7c7b45d1c0f20c5 (patch)
treec579d1744c9d1f56162a874dff687b55fb1b456a /third_party/libtiff
parentf4a9f83b38a0a45cda3205ad50747e6a7719f8ab (diff)
downloadpdfium-8e3f692b03e97659e855be4ea7c7b45d1c0f20c5.tar.xz
Update to zlib 1.2.11
This is the same version used by Chromium (as also the latest release of zlib). BUG=687631 Change-Id: Ia4bcdee3c36443ba01914d157ea795d7fb881a45 Reviewed-on: https://pdfium-review.googlesource.com/3096 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libtiff')
-rw-r--r--third_party/libtiff/0000-build-config.patch4
-rw-r--r--third_party/libtiff/tif_pixarlog.c2
-rw-r--r--third_party/libtiff/tif_zip.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch
index a6c5b2706b..28c62f9eea 100644
--- a/third_party/libtiff/0000-build-config.patch
+++ b/third_party/libtiff/0000-build-config.patch
@@ -73,7 +73,7 @@ diff a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c
#include "tif_predict.h"
-#include "zlib.h"
-+#include "../zlib_v128/zlib.h"
++#include "../zlib_v1211/zlib.h"
#include <stdio.h>
#include <stdlib.h>
@@ -85,7 +85,7 @@ diff a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c
*/
#include "tif_predict.h"
-#include "zlib.h"
-+#include "../zlib_v128/zlib.h"
++#include "../zlib_v1211/zlib.h"
#include <stdio.h>
diff --git a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c
index 0cf7f3a1ee..8f6ca8f63c 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_v128/zlib.h"
+#include "../zlib_v1211/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 92fd0ed463..0625bf179f 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_v128/zlib.h"
+#include "../zlib_v1211/zlib.h"
#include <stdio.h>