diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 17:30:47 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 17:30:47 -0700 |
| commit | fe85afa303449e70a607bbf8458bd816725e25d2 (patch) | |
| tree | 1d46e77a1ef6b28def6af3ffdd576017a6cfe229 /core/src/fxcodec/codec | |
| parent | c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a (diff) | |
| download | pdfium-fe85afa303449e70a607bbf8458bd816725e25d2.tar.xz | |
Revert "Move libopenjpeg to third_party/"
This reverts commit c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a.
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 2 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 <limits.h> #include <list> -#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 <algorithm> #include <limits> -#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" |