From 16a0b24fb35b6cb2e7e57a42735c0081fb9f2a20 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 10:48:05 -0700 Subject: Move lcms2 into third_party Second CL to apply less restrictive flags to third party. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1181943008. --- core/src/fxcodec/codec/fx_codec_icc.cpp | 3 ++- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 3b3b54b438..f33d085f56 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -5,8 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxcodec/fx_codec.h" +#include "../lcms2/fx_lcms2.h" #include "codec_int.h" -#include "../lcms2/include/fx_lcms2.h" + const FX_DWORD N_COMPONENT_LAB = 3; const FX_DWORD N_COMPONENT_GRAY = 1; const FX_DWORD N_COMPONENT_RGB = 3; diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 4f548eaa80..4457f1835a 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -9,7 +9,7 @@ #include "../../../include/fxcodec/fx_codec.h" #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" -#include "../lcms2/include/fx_lcms2.h" +#include "../lcms2/fx_lcms2.h" #include "codec_int.h" static void fx_error_callback(const char *msg, void *client_data) -- cgit v1.2.3