diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:05:27 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-18 17:05:27 -0700 |
| commit | e295819e5ded76e405b6d5800401cb5983b4ce10 (patch) | |
| tree | 64f28bd7e305081576c5509cdef42126561467c4 /core/src/fxcodec/codec | |
| parent | aa23c864b84d99f23a82ee8da852e575db981c07 (diff) | |
| download | pdfium-e295819e5ded76e405b6d5800401cb5983b4ce10.tar.xz | |
Move libopenjpeg to third_party/
We get to delete a whole bunch of fx_foo.c files that did nothing
but #include "foo.c" after defining _CRT_SECURE_NO_WARNINGS. Do this
from the .gyp/.gn files instead.
Also sort some "config"s in .gn file.
R=thestig@chromium.org
Committed: https://pdfium.googlesource.com/pdfium/+/c7a17bf9cdb0d646aa8b653e6ab2678a1837ed6a
Review URL: https://codereview.chromium.org/1185373010.
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 1c70c12333..d0d969cddc 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" |