From 9d6a2089c93c94461289b21a29771039eace95e7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 12 Apr 2017 11:32:32 -0400 Subject: Remove MakeSeekableReadStream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl removes the MakeSeekableReadStream call and, at the one place it's used, creates an IFX_MemoryStream which is a seekable read stream. Change-Id: I6b0b23636eff47f8caca5432313ba99703e21e4d Reviewed-on: https://pdfium-review.googlesource.com/4037 Reviewed-by: Nicolás Peña Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/cxfa_fileread.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 xfa/fxfa/cxfa_fileread.cpp (limited to 'xfa/fxfa/cxfa_fileread.cpp') diff --git a/xfa/fxfa/cxfa_fileread.cpp b/xfa/fxfa/cxfa_fileread.cpp new file mode 100644 index 0000000000..e2ecad2e93 --- /dev/null +++ b/xfa/fxfa/cxfa_fileread.cpp @@ -0,0 +1,56 @@ +// Copyright 2017 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#include "xfa/fxfa/cxfa_fileread.h" + +#include + +#include "core/fpdfapi/parser/cpdf_stream_acc.h" +#include "third_party/base/stl_util.h" + +CXFA_FileRead::CXFA_FileRead(const std::vector& streams) { + for (CPDF_Stream* pStream : streams) { + m_Data.push_back(pdfium::MakeRetain(pStream)); + m_Data.back()->LoadAllData(); + } +} + +CXFA_FileRead::~CXFA_FileRead() {} + +FX_FILESIZE CXFA_FileRead::GetSize() { + uint32_t dwSize = 0; + for (const auto& acc : m_Data) + dwSize += acc->GetSize(); + return dwSize; +} + +bool CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) { + int32_t iCount = pdfium::CollectionSize(m_Data); + int32_t index = 0; + while (index < iCount) { + const auto& acc = m_Data[index]; + FX_FILESIZE dwSize = acc->GetSize(); + if (offset < dwSize) + break; + + offset -= dwSize; + index++; + } + while (index < iCount) { + const auto& acc = m_Data[index]; + uint32_t dwSize = acc->GetSize(); + size_t dwRead = std::min(size, static_cast(dwSize - offset)); + memcpy(buffer, acc->GetData() + offset, dwRead); + size -= dwRead; + if (size == 0) + return true; + + buffer = static_cast(buffer) + dwRead; + offset = 0; + index++; + } + return false; +} -- cgit v1.2.3