summaryrefslogtreecommitdiff
path: root/samples
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 /samples
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 'samples')
-rw-r--r--samples/DEPS2
-rw-r--r--samples/image_diff_png.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/DEPS b/samples/DEPS
index 4a926a7cf2..fedf79e158 100644
--- a/samples/DEPS
+++ b/samples/DEPS
@@ -2,7 +2,7 @@ include_rules = [
'+public',
'+third_party/libpng16',
'+third_party/skia/include',
- '+third_party/zlib_v128',
+ '+third_party/zlib_v1211',
'+v8',
'+core/fdrm/crypto/fx_crypt.h',
]
diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc
index 18753e2580..020d29cbfd 100644
--- a/samples/image_diff_png.cc
+++ b/samples/image_diff_png.cc
@@ -18,7 +18,7 @@
#include "third_party/base/logging.h"
#include "third_party/libpng16/png.h"
-#include "third_party/zlib_v128/zlib.h"
+#include "third_party/zlib_v1211/zlib.h"
namespace image_diff_png {