diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-20 14:11:21 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-20 18:38:55 +0000 |
| commit | 283a0433b081f88275b2f7e8c04d3c41b9187ca6 (patch) | |
| tree | 4f6ff921e8a7de9b7922369c97731e54f647ea33 /core/fpdfapi/parser/cpdf_data_avail.cpp | |
| parent | 03f5bab415cda066855e2672154358056649c584 (diff) | |
| download | pdfium-283a0433b081f88275b2f7e8c04d3c41b9187ca6.tar.xz | |
Convert IFX_MemoryStream to CFX_MemoryStream
The CFX_MemoryStream is the only implementation of IFX_MemoryStream.
This CL removes the interfaces and uses CFX_MemoryStream directly.
Change-Id: I2f43fa39e82dafa7673517d214ae15fd2d0df331
Reviewed-on: https://pdfium-review.googlesource.com/4391
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_data_avail.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_data_avail.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp index f99cb467e5..41a3f0dae2 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/parser/cpdf_data_avail.cpp @@ -21,6 +21,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/fpdf_parser_utility.h" +#include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/numerics/safe_conversions.h" @@ -716,8 +717,8 @@ bool CPDF_DataAvail::IsLinearizedFile(uint8_t* pData, uint32_t dwLen) { if (m_pLinearized) return true; - CFX_RetainPtr<IFX_MemoryStream> file = - IFX_MemoryStream::Create(pData, (size_t)dwLen, false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + pData, static_cast<size_t>(dwLen), false); int32_t offset = GetHeaderOffset(file); if (offset == -1) { m_docStatus = PDF_DATAAVAIL_ERROR; @@ -756,8 +757,8 @@ bool CPDF_DataAvail::CheckEnd(DownloadHints* pHints) { uint8_t buffer[1024]; m_pFileRead->ReadBlock(buffer, req_pos, dwSize); - CFX_RetainPtr<IFX_MemoryStream> file = - IFX_MemoryStream::Create(buffer, (size_t)dwSize, false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + buffer, static_cast<size_t>(dwSize), false); m_syntaxParser.InitParser(file, 0); m_syntaxParser.RestorePos(dwSize - 1); @@ -804,8 +805,8 @@ int32_t CPDF_DataAvail::CheckCrossRefStream(DownloadHints* pHints, m_pFileRead->ReadBlock(pBuf, m_dwCurrentXRefSteam, iSize); - CFX_RetainPtr<IFX_MemoryStream> file = - IFX_MemoryStream::Create(pBuf, (size_t)iSize, false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + pBuf, static_cast<size_t>(iSize), false); m_parser.m_pSyntax->InitParser(file, 0); bool bNumber; @@ -1049,8 +1050,8 @@ bool CPDF_DataAvail::CheckTrailer(DownloadHints* pHints) { if (!m_pFileRead->ReadBlock(pBuf, m_dwTrailerOffset, iSize)) return false; - CFX_RetainPtr<IFX_MemoryStream> file = - IFX_MemoryStream::Create(pBuf, (size_t)iSize, false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + pBuf, static_cast<size_t>(iSize), false); m_syntaxParser.InitParser(file, 0); std::unique_ptr<CPDF_Object> pTrailer( |