From c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 19 Jun 2015 13:56:28 -0700 Subject: Merge to XF: Disintermediation. (cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e) Review URL: https://codereview.chromium.org/1199553002. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1197893002. --- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fxcodec/codec/fx_codec_jpx_opj.cpp') diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 8b1759e3ad..2d395b0b4b 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -7,9 +7,9 @@ #include #include +#include "../../../../third_party/lcms2-2.6/include/lcms2.h" #include "../../../../third_party/libopenjpeg20/openjpeg.h" #include "../../../include/fxcodec/fx_codec.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