diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-04 19:05:21 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-04 19:05:21 -0700 |
| commit | 6675a80c6afe3652b7bd918b80a16a8effb51b8f (patch) | |
| tree | 869efaae9312c11bb8f2fb7c707690a3fa468708 /core/src/fpdfapi | |
| parent | 76510e4127dc938d121ac5026000f3b0d84a2d46 (diff) | |
| download | pdfium-6675a80c6afe3652b7bd918b80a16a8effb51b8f.tar.xz | |
Merge to XFA: Move fx_safe_types.h to include/ directory.
Original Review URL: https://codereview.chromium.org/1147353006
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1152693005
Diffstat (limited to 'core/src/fpdfapi')
4 files changed, 16 insertions, 14 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 924c88e421..d29dee77d8 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -6,9 +6,9 @@ #include <limits.h> -#include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../src/fxcrt/fx_safe_types.h" +#include "../../../include/fpdfapi/fpdf_page.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "../../../third_party/base/numerics/safe_conversions_impl.h" #include "pageint.h" diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index f1b316a0d6..e54f503380 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" +#include <utility> +#include <vector> + #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../src/fxcrt/fx_safe_types.h" +#include "../../../include/fpdfapi/fpdf_parser.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "../fpdf_page/pageint.h" -#include <utility> -#include <vector> FX_BOOL IsSignatureDict(const CPDF_Dictionary* pDict) { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 9a11fa8798..214e4314da 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -4,14 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../fxcrt/fx_safe_types.h" +#include "../../../include/fpdfapi/fpdf_render.h" +#include "../../../include/fxcodec/fx_codec.h" +#include "../../../include/fxcrt/fx_safe_types.h" +#include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" #include "render_int.h" + FX_BOOL CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj, const CFX_AffineMatrix* pObj2Device) { CPDF_ImageRenderer render; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index b45d9c3e5d..3fabdf9f4f 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../src/fxcrt/fx_safe_types.h" +#include "../../../include/fpdfapi/fpdf_render.h" +#include "../../../include/fxcodec/fx_codec.h" +#include "../../../include/fxcrt/fx_safe_types.h" +#include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" #include "render_int.h" |