diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-23 15:41:39 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-23 15:41:39 -0400 |
| commit | a8a28e0702a1874d29d3c9f2b155bce1557eb4fd (patch) | |
| tree | 2b2d412e95004a846c39b9f05b444bbfce05d0a8 /core/fxcodec/codec | |
| parent | 029ea3ef8e49244e0a6e80d38768764ce27bad30 (diff) | |
| download | pdfium-a8a28e0702a1874d29d3c9f2b155bce1557eb4fd.tar.xz | |
Move core/include/fxcrt to core/fxcrt/include.
This CL moves the fxcrt code into the core/fxcrt directory. The only exception
was fx_bidi.h which was moved into core/fxcrt as it is not used outside of
core/.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1825953002 .
Diffstat (limited to 'core/fxcodec/codec')
| -rw-r--r-- | core/fxcodec/codec/fx_codec.cpp | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpeg.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_progress.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp index f1298f9fb3..92dba69acf 100644 --- a/core/fxcodec/codec/fx_codec.cpp +++ b/core/fxcodec/codec/fx_codec.cpp @@ -10,8 +10,8 @@ #include <utility> #include "core/fxcodec/codec/codec_int.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_safe_types.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "third_party/base/logging.h" CCodec_ModuleMgr::CCodec_ModuleMgr() diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index efbeb790e3..1b0dff7499 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -7,8 +7,8 @@ #include <setjmp.h> #include "core/fxcodec/codec/codec_int.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxge/fx_dib.h" extern "C" { diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp index a57b93df22..607f082823 100644 --- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -9,9 +9,9 @@ #include <vector> #include "core/fxcodec/codec/codec_int.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "core/include/fpdfapi/fpdf_resource.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/lcms2-2.6/include/lcms2.h" #include "third_party/libopenjpeg20/openjpeg.h" diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h index c9ee389e02..e4335ccf47 100644 --- a/core/fxcodec/codec/fx_codec_progress.h +++ b/core/fxcodec/codec/fx_codec_progress.h @@ -7,9 +7,9 @@ #ifndef CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_ #define CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_ +#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_memory.h" -#include "core/include/fxcrt/fx_system.h" #include "core/include/fxge/fx_dib.h" #define FXCODEC_BLOCK_SIZE 4096 |