diff options
| author | Andrew Weintraub <asweintraub@google.com> | 2017-11-29 23:27:10 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-29 23:27:10 +0000 |
| commit | 98b56332e9b5c04cde680301a8b0685590c3b922 (patch) | |
| tree | 97b1f6f67b60678f37844322ccb0a657f9b3266c /core | |
| parent | 02f46ae70560c4bd70950faa1496e0c6b244ff8d (diff) | |
| download | pdfium-98b56332e9b5c04cde680301a8b0685590c3b922.tar.xz | |
Allow building pdfium against the system version of libpng.
Bug:
Change-Id: I0c930ca30637f58af3b60ed8f1383bd9234a1723
Reviewed-on: https://pdfium-review.googlesource.com/19850
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index 40bdfba7ce..37e83f7248 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -14,10 +14,11 @@ #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" -extern "C" { -#undef FAR +#ifdef USE_SYSTEM_LIBPNG +#include <png.h> +#else #include "third_party/libpng16/png.h" -} // extern "C" +#endif #define PNG_ERROR_SIZE 256 |