diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:51:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:51:37 -0700 |
| commit | 6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd (patch) | |
| tree | 7406f00d80a9bf9d30573fef0a6003c9940201c4 /core/src/fxcodec/codec | |
| parent | 25d5be60c504f3df0722caea6e7a846b8e8d9537 (diff) | |
| download | pdfium-6fd997b710e96e0c66d6dcd2e1c5cfd950d6accd.tar.xz | |
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.
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 0660fecb6e..58b9793fde 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 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 <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" |