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_parser.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_parser.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_parser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp index c18a183a33..86428ab9d7 100644 --- a/core/fpdfapi/parser/cpdf_parser.cpp +++ b/core/fpdfapi/parser/cpdf_parser.cpp @@ -22,6 +22,7 @@ #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.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/ptr_util.h" @@ -1114,8 +1115,9 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObject( if (!pObjStream) return nullptr; - CFX_RetainPtr<IFX_MemoryStream> file = IFX_MemoryStream::Create( - (uint8_t*)pObjStream->GetData(), (size_t)pObjStream->GetSize(), false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + const_cast<uint8_t*>(pObjStream->GetData()), + static_cast<size_t>(pObjStream->GetSize()), false); CPDF_SyntaxParser syntax; syntax.InitParser(file, 0); const int32_t offset = GetStreamFirst(pObjStream); @@ -1194,8 +1196,8 @@ void CPDF_Parser::GetIndirectBinary(uint32_t objnum, int32_t offset = GetStreamFirst(pObjStream); const uint8_t* pData = pObjStream->GetData(); uint32_t totalsize = pObjStream->GetSize(); - CFX_RetainPtr<IFX_MemoryStream> file = - IFX_MemoryStream::Create((uint8_t*)pData, (size_t)totalsize, false); + auto file = pdfium::MakeRetain<CFX_MemoryStream>( + const_cast<uint8_t*>(pData), static_cast<size_t>(totalsize), false); CPDF_SyntaxParser syntax; syntax.InitParser(file, 0); |