diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-02-05 10:03:18 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-02-05 10:03:18 -0800 |
| commit | 35425896b07b5124651c249d6ce29285cf71ea3b (patch) | |
| tree | 0cd30ec338fffdebb3aee6a899beeb3835c6f194 /core/src/fpdfapi | |
| parent | 53476d6956781ceb252e1ae5e01f83a48bcb4908 (diff) | |
| download | pdfium-35425896b07b5124651c249d6ce29285cf71ea3b.tar.xz | |
Merge to XFA: Add namespace and-re-arrange PDFium's local copy of /base.
Original revieww URL: https://codereview.chromium.org/900753002
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/880603004
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 4ba0489ee4..b57272d35e 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -9,7 +9,7 @@ #include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../src/fxcrt/fx_safe_types.h" -#include "../../../third_party/numerics/safe_conversions_impl.h" +#include "../../../third_party/base/numerics/safe_conversions_impl.h" #include "pageint.h" class CPDF_PSEngine; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index eaecb0fe9f..d99390d4e2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -1076,8 +1076,8 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE pos, FX_FILESIZE& prev, FX_BOOL if (startnum < 0) { continue; } - m_dwXrefStartObjNum = base::checked_cast<FX_DWORD, FX_INT32> (startnum); - FX_DWORD count = base::checked_cast<FX_DWORD, FX_INT32> (arrIndex[i].second); + m_dwXrefStartObjNum = pdfium::base::checked_cast<FX_DWORD, FX_INT32> (startnum); + FX_DWORD count = pdfium::base::checked_cast<FX_DWORD, FX_INT32> (arrIndex[i].second); FX_SAFE_DWORD dwCaculatedSize = segindex; dwCaculatedSize += count; dwCaculatedSize *= totalWidth; @@ -1087,7 +1087,7 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE pos, FX_FILESIZE& prev, FX_BOOL FX_LPCBYTE segstart = pData + segindex * totalWidth; FX_SAFE_DWORD dwMaxObjNum = startnum; dwMaxObjNum += count; - FX_DWORD dwV5Size = base::checked_cast<FX_DWORD, FX_INT32> (m_V5Type.GetSize()); + FX_DWORD dwV5Size = pdfium::base::checked_cast<FX_DWORD, FX_INT32> (m_V5Type.GetSize()); if (!dwMaxObjNum.IsValid() || dwMaxObjNum.ValueOrDie() > dwV5Size) { continue; } @@ -2443,7 +2443,7 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, PARSE_CONTEXT CPDF_CryptoHandler* pCryptoHandler = objnum == (FX_DWORD)m_MetadataObjnum ? NULL : m_pCryptoHandler; if (pCryptoHandler == NULL) { - base::CheckedNumeric<FX_FILESIZE> pos = m_Pos; + pdfium::base::CheckedNumeric<FX_FILESIZE> pos = m_Pos; pos += len; if (pos.IsValid() && pos.ValueOrDie() < m_FileLen) { m_Pos = pos.ValueOrDie(); @@ -3080,7 +3080,7 @@ FX_BOOL CPDF_DataAvail::IsObjectsAvail(CFX_PtrArray& obj_array, FX_BOOL bParsePa FX_DWORD dwNum = pRef->GetRefObjNum(); FX_FILESIZE offset; FX_DWORD original_size = GetObjectSize(dwNum, offset); - base::CheckedNumeric<FX_DWORD> size = original_size; + pdfium::base::CheckedNumeric<FX_DWORD> size = original_size; if (size.ValueOrDefault(0) == 0 || offset < 0 || offset >= m_dwFileLen) { break; } @@ -3307,7 +3307,7 @@ CPDF_Object* CPDF_DataAvail::GetObject(FX_DWORD objnum, IFX_DownloadHints* pHint pParser = (CPDF_Parser *)(m_pDocument->GetParser()); } - base::CheckedNumeric<FX_DWORD> size = original_size; + pdfium::base::CheckedNumeric<FX_DWORD> size = original_size; if (size.ValueOrDefault(0) == 0 || offset < 0 || offset >= m_dwFileLen) { if (pExistInFile) *pExistInFile = FALSE; |