diff options
Diffstat (limited to 'core/fxcodec')
-rw-r--r-- | core/fxcodec/codec/fx_codec_icc.cpp | 5 | ||||
-rw-r--r-- | core/fxcodec/codec/fx_codec_jpx_opj.cpp | 7 |
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; } |