summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-05-24 08:40:49 +0200
committerChromium commit bot <commit-bot@chromium.org>2017-05-24 23:48:30 +0000
commit0fafb4fc5009418bff9578f8da940a980ee5b28d (patch)
tree3e79229c223e41eede4773124469fce6a07f51e6 /core
parentdc8a2b7606c2c6c12d5cfb280dfb49128c1a60ab (diff)
downloadpdfium-0fafb4fc5009418bff9578f8da940a980ee5b28d.tar.xz
core: allow building against system lcms2chromium/3111
In a way similar to the existing USE_SYSTEM_ZLIB. The default is of course still the bundled lcms2. Change-Id: I219b50854b3c7870b0f4d94574ba39f6cb26f556 Reviewed-on: https://pdfium-review.googlesource.com/5870 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/fx_codec_icc.cpp5
-rw-r--r--core/fxcodec/codec/fx_codec_jpx_opj.cpp7
2 files changed, 11 insertions, 1 deletions
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp
index 7592c053c5..ee562f0e92 100644
--- a/core/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/fx_codec_icc.cpp
@@ -6,7 +6,12 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
+
+#if defined(USE_SYSTEM_LCMS2)
+#include <lcms2.h>
+#else
#include "third_party/lcms2-2.6/include/lcms2.h"
+#endif
struct CLcmsCmm {
cmsHTRANSFORM m_hTransform;
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 30e79deeeb..9627025164 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -16,9 +16,14 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/lcms2-2.6/include/lcms2.h"
#include "third_party/libopenjpeg20/openjpeg.h"
+#if defined(USE_SYSTEM_LCMS2)
+#include <lcms2.h>
+#else
+#include "third_party/lcms2-2.6/include/lcms2.h"
+#endif
+
static void fx_error_callback(const char* msg, void* client_data) {
(void)client_data;
}