From 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 17:51:37 -0700 Subject: Merge to XFA: Move libopenjpeg to third_party/ Original Review URL: https://codereview.chromium.org/1185373010. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1193773002. --- core/src/fxcodec/codec/codec_int.h | 2 +- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 0660fecb6e..58b9793fde 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -10,9 +10,9 @@ #include #include +#include "../../../../third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. #include "../../../include/fxcodec/fx_codec.h" #include "../jbig2/JBig2_Context.h" -#include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. class CCodec_BasicModule : public ICodec_BasicModule { diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 4457f1835a..8b1759e3ad 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -7,8 +7,8 @@ #include #include +#include "../../../../third_party/libopenjpeg20/openjpeg.h" #include "../../../include/fxcodec/fx_codec.h" -#include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" #include "../lcms2/fx_lcms2.h" #include "codec_int.h" -- cgit v1.2.3