diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 13:43:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 13:43:30 -0700 |
| commit | 8a4e286e686c3027f382afb07d3ddcec4610fdd9 (patch) | |
| tree | c693cffa5f7969110c4b6b969120e794fe6bbfd7 | |
| parent | e0307861b8e55c9f44e947d8bf82b9c16ec9b963 (diff) | |
| download | pdfium-8a4e286e686c3027f382afb07d3ddcec4610fdd9.tar.xz | |
Move core/fxcodec/codec/include and core/fxcodec/include files up
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2381063002
49 files changed, 65 insertions, 68 deletions
@@ -569,6 +569,7 @@ static_library("fpdftext") { static_library("fxcodec") { sources = [ + "core/fxcodec/JBig2_DocumentContext.h", "core/fxcodec/codec/ccodec_basicmodule.h", "core/fxcodec/codec/ccodec_faxmodule.h", "core/fxcodec/codec/ccodec_flatemodule.h", @@ -585,9 +586,8 @@ static_library("fxcodec") { "core/fxcodec/codec/fx_codec_jbig.cpp", "core/fxcodec/codec/fx_codec_jpeg.cpp", "core/fxcodec/codec/fx_codec_jpx_opj.cpp", - "core/fxcodec/include/JBig2_DocumentContext.h", - "core/fxcodec/include/fx_codec.h", - "core/fxcodec/include/fx_codec_def.h", + "core/fxcodec/fx_codec.h", + "core/fxcodec/fx_codec_def.h", "core/fxcodec/jbig2/JBig2_ArithDecoder.cpp", "core/fxcodec/jbig2/JBig2_ArithDecoder.h", "core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp", @@ -645,13 +645,13 @@ static_library("fxcodec") { "core/fxcodec/codec/ccodec_bmpmodule.h", "core/fxcodec/codec/ccodec_gifmodule.h", "core/fxcodec/codec/ccodec_pngmodule.h", + "core/fxcodec/codec/ccodec_progressivedecoder.h", "core/fxcodec/codec/ccodec_tiffmodule.h", "core/fxcodec/codec/fx_codec_bmp.cpp", "core/fxcodec/codec/fx_codec_gif.cpp", "core/fxcodec/codec/fx_codec_png.cpp", "core/fxcodec/codec/fx_codec_progress.cpp", "core/fxcodec/codec/fx_codec_tiff.cpp", - "core/fxcodec/codec/include/ccodec_progressivedecoder.h", "core/fxcodec/lbmp/fx_bmp.cpp", "core/fxcodec/lbmp/fx_bmp.h", "core/fxcodec/lgif/fx_gif.cpp", diff --git a/core/fpdfapi/cpdf_modulemgr.cpp b/core/fpdfapi/cpdf_modulemgr.cpp index 26a0ff37e6..a8ecc6d154 100644 --- a/core/fpdfapi/cpdf_modulemgr.cpp +++ b/core/fpdfapi/cpdf_modulemgr.cpp @@ -7,7 +7,7 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" namespace { diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp index 53e0807841..d7469b6d98 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp @@ -18,7 +18,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" namespace { diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp index 750dbd1a50..5a1f9af037 100644 --- a/core/fpdfapi/fpdf_page/cpdf_image.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp @@ -19,7 +19,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/fpdf_render/render_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/fx_dib.h" CPDF_Image::CPDF_Image(CPDF_Document* pDoc) diff --git a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp index f900640a63..472e8751d7 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -17,7 +17,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" namespace { diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 5a25c308fd..ddd640ec7f 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -27,7 +27,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/cfx_fxgedevice.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp index cf8bed67ef..30a50f54ae 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -20,7 +20,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_render/render_int.h" -#include "core/fxcodec/include/JBig2_DocumentContext.h" +#include "core/fxcodec/JBig2_DocumentContext.h" #include "core/fxge/include/cfx_unicodeencoding.h" #include "core/fxge/include/fx_font.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index 9af8a9292e..62350cdd1e 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -16,7 +16,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_ext.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index 62b92c605b..8867af0df1 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -24,7 +24,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_pathdata.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index aa590dfc33..d464eab6e1 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -18,7 +18,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" namespace { diff --git a/core/fxcodec/include/JBig2_DocumentContext.h b/core/fxcodec/JBig2_DocumentContext.h index d49bdfab8e..9e5d3b3d3b 100644 --- a/core/fxcodec/include/JBig2_DocumentContext.h +++ b/core/fxcodec/JBig2_DocumentContext.h @@ -4,8 +4,8 @@ // // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ -#define CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ +#ifndef CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_ +#define CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_ #include <list> #include <memory> @@ -31,4 +31,4 @@ class JBig2_DocumentContext { std::list<CJBig2_CachePair> m_SymbolDictCache; }; -#endif // CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ +#endif // CORE_FXCODEC_JBIG2_DOCUMENTCONTEXT_H_ diff --git a/core/fxcodec/codec/ccodec_iccmodule.h b/core/fxcodec/codec/ccodec_iccmodule.h index 8d4d0e9ca0..f97065b971 100644 --- a/core/fxcodec/codec/ccodec_iccmodule.h +++ b/core/fxcodec/codec/ccodec_iccmodule.h @@ -7,7 +7,7 @@ #ifndef CORE_FXCODEC_CODEC_CCODEC_ICCMODULE_H_ #define CORE_FXCODEC_CODEC_CCODEC_ICCMODULE_H_ -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" diff --git a/core/fxcodec/codec/ccodec_jbig2module.h b/core/fxcodec/codec/ccodec_jbig2module.h index 765a11fcb4..d2b97b82a0 100644 --- a/core/fxcodec/codec/ccodec_jbig2module.h +++ b/core/fxcodec/codec/ccodec_jbig2module.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/include/fx_basic.h" class CJBig2_Context; diff --git a/core/fxcodec/codec/include/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 04b21da5ee..8540493648 100644 --- a/core/fxcodec/codec/include/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_ -#define CORE_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_ +#ifndef CORE_FXCODEC_CODEC_CCODEC_PROGRESSIVEDECODER_H_ +#define CORE_FXCODEC_CODEC_CCODEC_PROGRESSIVEDECODER_H_ #include <vector> -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_dib.h" @@ -235,4 +235,4 @@ class CCodec_ProgressiveDecoder { void ResampleVertBT(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row); }; -#endif // CORE_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_ +#endif // CORE_FXCODEC_CODEC_CCODEC_PROGRESSIVEDECODER_H_ diff --git a/core/fxcodec/codec/codec_int.h b/core/fxcodec/codec/codec_int.h index 566bbc3c9b..edd5a67a25 100644 --- a/core/fxcodec/codec/codec_int.h +++ b/core/fxcodec/codec/codec_int.h @@ -14,7 +14,7 @@ #include <memory> #include <vector> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcodec/jbig2/JBig2_Context.h" #include "third_party/libopenjpeg20/openjpeg.h" diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp index 7f0c8ad225..60a64a1ab6 100644 --- a/core/fxcodec/codec/fx_codec.cpp +++ b/core/fxcodec/codec/fx_codec.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include <cmath> #include <memory> diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp index beda53c05b..c58aefbef7 100644 --- a/core/fxcodec/codec/fx_codec_bmp.cpp +++ b/core/fxcodec/codec/fx_codec_bmp.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcodec/lbmp/fx_bmp.h" #include "core/fxge/include/fx_dib.h" struct FXBMP_Context { diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp index 91e6f9a7be..336c35b8d4 100644 --- a/core/fxcodec/codec/fx_codec_fax.cpp +++ b/core/fxcodec/codec/fx_codec_fax.cpp @@ -8,7 +8,7 @@ #include <vector> #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" namespace { diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp index fd86cf3380..c34aabbcab 100644 --- a/core/fxcodec/codec/fx_codec_flate.cpp +++ b/core/fxcodec/codec/fx_codec_flate.cpp @@ -9,7 +9,7 @@ #include <algorithm> #include <memory> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_ext.h" #include "third_party/zlib_v128/zlib.h" diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp index f04192ebef..f02dace23e 100644 --- a/core/fxcodec/codec/fx_codec_gif.cpp +++ b/core/fxcodec/codec/fx_codec_gif.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcodec/lgif/fx_gif.h" #include "core/fxge/include/fx_dib.h" struct FXGIF_Context { diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp index b5060a9fb6..8e48bfbfea 100644 --- a/core/fxcodec/codec/fx_codec_icc.cpp +++ b/core/fxcodec/codec/fx_codec_icc.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "third_party/lcms2-2.6/include/lcms2.h" const uint32_t N_COMPONENT_LAB = 3; diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp index 650d616a73..93e5494ea0 100644 --- a/core/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/fxcodec/codec/fx_codec_jbig.cpp @@ -9,7 +9,7 @@ #include <list> #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fxcodec/include/JBig2_DocumentContext.h" +#include "core/fxcodec/JBig2_DocumentContext.h" #include "core/fxcodec/jbig2/JBig2_Context.h" #include "core/fxcodec/jbig2/JBig2_Image.h" #include "core/fxcrt/include/fx_memory.h" diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index c2814a4b4c..29c6f8c423 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -7,7 +7,7 @@ #include <setjmp.h> #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/fx_dib.h" diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp index d5a95eef89..219b1a0a12 100644 --- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_colorspace.h" #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/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_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp index 9f7faa68e0..bfbdf6c675 100644 --- a/core/fxcodec/codec/fx_codec_png.cpp +++ b/core/fxcodec/codec/fx_codec_png.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/fx_dib.h" extern "C" { diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index 9ac6913788..d468296acd 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcodec/codec/include/ccodec_progressivedecoder.h" +#include "core/fxcodec/codec/ccodec_progressivedecoder.h" #include <algorithm> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/fx_dib.h" #include "third_party/base/numerics/safe_math.h" diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp index 2a00bb2d20..d4e5ddeeb8 100644 --- a/core/fxcodec/codec/fx_codec_tiff.cpp +++ b/core/fxcodec/codec/fx_codec_tiff.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/fx_dib.h" extern "C" { diff --git a/core/fxcodec/include/fx_codec.h b/core/fxcodec/fx_codec.h index 8621db2b2c..5e00faf328 100644 --- a/core/fxcodec/include/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_H_ -#define CORE_FXCODEC_INCLUDE_FX_CODEC_H_ +#ifndef CORE_FXCODEC_FX_CODEC_H_ +#define CORE_FXCODEC_FX_CODEC_H_ #include <map> #include <memory> @@ -19,7 +19,7 @@ #include "core/fxcodec/codec/ccodec_jpegmodule.h" #include "core/fxcodec/codec/ccodec_jpxmodule.h" #include "core/fxcodec/codec/ccodec_scanlinedecoder.h" -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_coordinates.h" @@ -126,4 +126,4 @@ void FaxG4Decode(const uint8_t* src_buf, int height, int pitch); -#endif // CORE_FXCODEC_INCLUDE_FX_CODEC_H_ +#endif // CORE_FXCODEC_FX_CODEC_H_ diff --git a/core/fxcodec/include/fx_codec_def.h b/core/fxcodec/fx_codec_def.h index fb1b5bcdac..fd23d78fa5 100644 --- a/core/fxcodec/include/fx_codec_def.h +++ b/core/fxcodec/fx_codec_def.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ -#define CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ +#ifndef CORE_FXCODEC_FX_CODEC_DEF_H_ +#define CORE_FXCODEC_FX_CODEC_DEF_H_ enum FXCODEC_STATUS { FXCODEC_STATUS_ERROR = -1, @@ -89,4 +89,4 @@ enum FXCODEC_RESUNIT { #define EXIFTAG_STRING_DATETIME 306 #define EXIFTAG_STRING_COPYRIGHT 33432 -#endif // CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ +#endif // CORE_FXCODEC_FX_CODEC_DEF_H_ diff --git a/core/fxcodec/include/DEPS b/core/fxcodec/include/DEPS deleted file mode 100644 index 548eb61a3b..0000000000 --- a/core/fxcodec/include/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - '+third_party/zlib_v128/zlib.h', -] diff --git a/core/fxcodec/jbig2/JBig2_Context.h b/core/fxcodec/jbig2/JBig2_Context.h index 8ae00a9bad..ab94d9eb98 100644 --- a/core/fxcodec/jbig2/JBig2_Context.h +++ b/core/fxcodec/jbig2/JBig2_Context.h @@ -13,7 +13,7 @@ #include <vector> #include "core/fpdfapi/fpdf_parser/cpdf_object.h" -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcodec/jbig2/JBig2_List.h" #include "core/fxcodec/jbig2/JBig2_Page.h" #include "core/fxcodec/jbig2/JBig2_Segment.h" diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp index b692909c01..344367dfa3 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.cpp +++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp @@ -8,7 +8,7 @@ #include <memory> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h" #include "core/fxcodec/jbig2/JBig2_BitStream.h" #include "core/fxcodec/jbig2/JBig2_Image.h" diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h index 6026798aad..ea9748ce80 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.h +++ b/core/fxcodec/jbig2/JBig2_GrdProc.h @@ -7,7 +7,7 @@ #ifndef CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_ #define CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_ -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_system.h" diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index 34d2a05d80..1c82620ca0 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -8,7 +8,7 @@ #include <algorithm> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/cfx_cliprgn.h" diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp index 2ac455bfb5..fa4cc783df 100644 --- a/core/fxge/dib/fx_dib_composite.cpp +++ b/core/fxge/dib/fx_dib_composite.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/include/cfx_gemodule.h" diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp index cb64960953..829c2113f1 100644 --- a/core/fxge/dib/fx_dib_convert.cpp +++ b/core/fxge/dib/fx_dib_convert.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/fx_dib.h" class CFX_Palette { diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 9575e6aac4..5b40b850b9 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -9,7 +9,7 @@ #include <limits.h> #include <algorithm> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/include/cfx_gemodule.h" diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index 415711f0cd..4612877980 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -8,7 +8,7 @@ #include <limits> #include <vector> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_pathdata.h" diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 55d66e037a..bcbe2d10f7 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -6,7 +6,7 @@ #include <algorithm> #include <vector> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h" diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 061bc0a4d0..e3d00d93f6 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -13,7 +13,7 @@ #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <crtdbg.h> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #ifndef _SKIA_SUPPORT_ diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 8fc863dda3..286d5888e7 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -6,7 +6,7 @@ include_rules = [ '+core/fpdfapi/fpdf_parser', '+core/fpdfapi/fpdf_render', '+core/fpdfdoc', - '+core/fxcodec/include', + '+core/fxcodec', '+core/fxcrt/include', '+core/fxge/include', '+public', diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index d6d7f3b8e8..2f00afad33 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -21,7 +21,7 @@ #include "core/fpdfdoc/cpdf_nametree.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpdf_viewerpreferences.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/cfx_fxgedevice.h" diff --git a/xfa/fxbarcode/DEPS b/xfa/fxbarcode/DEPS index 4d9d2029e0..535f39b1eb 100644 --- a/xfa/fxbarcode/DEPS +++ b/xfa/fxbarcode/DEPS @@ -1,4 +1,4 @@ include_rules = [ - '+core/fxcodec/include', - '+core/fxcodec/codec/include', + '+core/fxcodec', + '+core/fxcodec/codec', ] diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS index abdf53d98f..fed4e8526d 100644 --- a/xfa/fxfa/app/DEPS +++ b/xfa/fxfa/app/DEPS @@ -4,6 +4,6 @@ include_rules = [ '+core/fpdfapi/fpdf_page', '+core/fpdfapi/fpdf_parser', '+core/fpdfdoc', - '+core/fxcodec/include', - '+core/fxcodec/codec/include', + '+core/fxcodec', + '+core/fxcodec/codec', ] diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 2ef9840c1a..31cbf25928 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -10,8 +10,8 @@ #include <memory> #include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h" -#include "core/fxcodec/codec/include/ccodec_progressivedecoder.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/codec/ccodec_progressivedecoder.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/xfa/fxfa/include/DEPS b/xfa/fxfa/include/DEPS index 97ccb1faa6..1519ceaa93 100644 --- a/xfa/fxfa/include/DEPS +++ b/xfa/fxfa/include/DEPS @@ -1,3 +1,3 @@ include_rules = [ - '+core/fxcodec/include', + '+core/fxcodec', ] diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index ca325ee33d..7b6130f09b 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcodec/include/fx_codec_def.h" +#include "core/fxcodec/fx_codec_def.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" diff --git a/xfa/fxfa/parser/DEPS b/xfa/fxfa/parser/DEPS index 97ccb1faa6..1519ceaa93 100644 --- a/xfa/fxfa/parser/DEPS +++ b/xfa/fxfa/parser/DEPS @@ -1,3 +1,3 @@ include_rules = [ - '+core/fxcodec/include', + '+core/fxcodec', ] diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 94a2f5a3f6..9b444defee 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/include/fx_xml.h" #include "core/fxge/include/cfx_gemodule.h" #include "xfa/fxfa/parser/cxfa_document.h" |