diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-20 09:35:06 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-20 09:35:06 -0800 |
| commit | 7386e293a2b67794e6af02d0b71020a4bc987ce0 (patch) | |
| tree | 03abdeac97118499ba28fab295b0a490b47b3b54 /core/include | |
| parent | aa28c814795edfdeb0654f16e77a54f65b7d42c2 (diff) | |
| download | pdfium-7386e293a2b67794e6af02d0b71020a4bc987ce0.tar.xz | |
Reduce diffs with master in core
This week's version. Mostly whitespace, but takes the
master version of core/src/fxge/ge/fx_ge_text.cpp
verbatim.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1462923004 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_render.h | 9 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_ext.h | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 06f5dbef11..cdd7e38d65 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -137,11 +137,12 @@ class CPDF_ProgressiveRenderer { // cannot #include that header. fpdfsdk/src/fpdf_progressive.cpp has // static_asserts to make sure the two sets of values match. enum Status { - Ready, // FPDF_RENDER_READER, - ToBeContinued, // FPDF_RENDER_TOBECOUNTINUED, - Done, // FPDF_RENDER_DONE, - Failed, // FPDF_RENDER_FAILED + Ready, // FPDF_RENDER_READER + ToBeContinued, // FPDF_RENDER_TOBECOUNTINUED + Done, // FPDF_RENDER_DONE + Failed // FPDF_RENDER_FAILED }; + static int ToFPDFStatus(Status status) { return static_cast<int>(status); } CPDF_ProgressiveRenderer(CPDF_RenderContext* pContext, diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h index d36ecfde4e..8530263a79 100644 --- a/core/include/fxcrt/fx_ext.h +++ b/core/include/fxcrt/fx_ext.h @@ -7,12 +7,12 @@ #ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_ #define CORE_INCLUDE_FXCRT_FX_EXT_H_ -#include "fx_string.h" -#include "fx_system.h" - #include <cctype> #include <cwctype> +#include "fx_string.h" +#include "fx_system.h" + FX_FLOAT FXSYS_tan(FX_FLOAT a); FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x); FX_FLOAT FXSYS_strtof(const FX_CHAR* pcsStr, |