diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-17 15:48:48 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-17 15:48:48 -0700 |
| commit | b2ed5de36ca387e0a9bbc3dfb9f5b568c7cc2ea8 (patch) | |
| tree | 05baf3a6a82bed3bdbbc82b97debf384bcce6ee5 | |
| parent | 363bfbcc2a1b223147d16d184c357591c9829242 (diff) | |
| download | pdfium-b2ed5de36ca387e0a9bbc3dfb9f5b568c7cc2ea8.tar.xz | |
Merge to XFA: Fix a #include in fpdf_page_func.cpp.
Not sure why building with gyp was working despite the missing '../' but
it wasn't working in stricter build systems.
TBR=dml@google.com
Review URL: https://codereview.chromium.org/1321293003.
(cherry picked from commit fa31d9630aadfe101d3b35e26ce0fc926ec1505b)
Review URL: https://codereview.chromium.org/1345313003 .
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 2 | ||||
| -rw-r--r-- | third_party/base/numerics/safe_conversions_impl.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 8c909a9e68..224c99bb69 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -6,10 +6,10 @@ #include <limits.h> +#include "../../../../third_party/base/numerics/safe_conversions_impl.h" #include "../../../include/fpdfapi/fpdf_module.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" class CPDF_PSEngine; diff --git a/third_party/base/numerics/safe_conversions_impl.h b/third_party/base/numerics/safe_conversions_impl.h index ed3c39c7f0..f7afdfe31c 100644 --- a/third_party/base/numerics/safe_conversions_impl.h +++ b/third_party/base/numerics/safe_conversions_impl.h @@ -217,4 +217,3 @@ inline RangeConstraint DstRangeRelationToSrcRange(Src value) { } // namespace pdfium #endif // PDFIUM_THIRD_PARTY_BASE_SAFE_CONVERSIONS_IMPL_H_ - |