summaryrefslogtreecommitdiff
path: root/core
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 /core
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 'core')
-rw-r--r--core/fxcodec/DEPS2
-rw-r--r--core/fxcodec/codec/fx_codec_flate.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/fxcodec/DEPS b/core/fxcodec/DEPS
index a88b3294a9..85e74dd5a3 100644
--- a/core/fxcodec/DEPS
+++ b/core/fxcodec/DEPS
@@ -4,5 +4,5 @@ include_rules = [
# For non-standalone builds that may use libjpeg_turbo.
'+third_party/libjpeg_turbo/jpeglib.h',
'+third_party/libopenjpeg20',
- '+third_party/zlib_v128',
+ '+third_party/zlib_v1211',
]
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index f908908062..7c19d335bb 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -15,7 +15,7 @@
#include "core/fxcrt/fx_ext.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/zlib_v128/zlib.h"
+#include "third_party/zlib_v1211/zlib.h"
extern "C" {