diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 11:05:02 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 11:05:02 -0700 |
| commit | 8be557542973c786d1024a7bfb300df230f00464 (patch) | |
| tree | 128ced2e83deea3920b043404336bc7ca9b0d1ef /core/src/fxcodec/codec | |
| parent | b7d358b498800e4c240d381fa6f098af17a4d95b (diff) | |
| download | pdfium-8be557542973c786d1024a7bfb300df230f00464.tar.xz | |
Merge to XFA: Move lcms2 into third_party
Original Review URL: https://codereview.chromium.org/1181943008.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1187273006.
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_icc.cpp | 3 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 3b3b54b438..f33d085f56 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -5,8 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxcodec/fx_codec.h" +#include "../lcms2/fx_lcms2.h" #include "codec_int.h" -#include "../lcms2/include/fx_lcms2.h" + const FX_DWORD N_COMPONENT_LAB = 3; const FX_DWORD N_COMPONENT_GRAY = 1; const FX_DWORD N_COMPONENT_RGB = 3; diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index ce82960340..4457f1835a 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -8,9 +8,9 @@ #include <limits> #include "../../../include/fxcodec/fx_codec.h" -#include "codec_int.h" #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" -#include "../lcms2/include/fx_lcms2.h" +#include "../lcms2/fx_lcms2.h" +#include "codec_int.h" static void fx_error_callback(const char *msg, void *client_data) { |