From fe85afa303449e70a607bbf8458bd816725e25d2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 17:30:47 -0700 Subject: Revert "Move libopenjpeg to third_party/" This reverts commit c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a. --- 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 d0d969cddc..1c70c12333 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 8b1759e3ad..4457f1835a 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