From a76a6d8bcb76077fa248b64c5d64791dc8f23771 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 15 Jan 2016 19:38:03 -0800 Subject: XFA: Rename libpng to libpng16. Otherwise this conflicts with Chromium's copy if the include paths just happens to be in the wrong order. Since the two copies of libpng are of different versions, we cannot use Chromium's copy. TBR=tsepez@chromium.org,ochang@chromium.org Review URL: https://codereview.chromium.org/1599513004 . --- core/src/fxcodec/codec/DEPS | 2 +- core/src/fxcodec/codec/fx_codec_png.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/src/fxcodec/codec/DEPS b/core/src/fxcodec/codec/DEPS index bfbbd82831..495d288992 100644 --- a/core/src/fxcodec/codec/DEPS +++ b/core/src/fxcodec/codec/DEPS @@ -1,4 +1,4 @@ include_rules = [ - '+third_party/libpng/png.h', + '+third_party/libpng16/png.h', '+third_party/libtiff/tiffiop.h', ] diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp index 97c2f77f77..9e08473339 100644 --- a/core/src/fxcodec/codec/fx_codec_png.cpp +++ b/core/src/fxcodec/codec/fx_codec_png.cpp @@ -12,7 +12,7 @@ extern "C" { #undef FAR -#include "third_party/libpng/png.h" +#include "third_party/libpng16/png.h" } static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) { -- cgit v1.2.3