From 30029419ad4b9e5cd382767a8645677afbeff7fd Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 13 Aug 2018 19:56:29 +0000 Subject: Use CFX_ReadOnlyMemoryStream in more places. More const pointers, less const_casts. BUG=pdfium:263 Change-Id: I47fc6d8f2f837390e40ad22d8b67946065294eaa Reviewed-on: https://pdfium-review.googlesource.com/39879 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fpdfapi/parser/cfdf_document.cpp | 11 +++++------ core/fpdfapi/parser/cfdf_document.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/parser') diff --git a/core/fpdfapi/parser/cfdf_document.cpp b/core/fpdfapi/parser/cfdf_document.cpp index bfade94af6..cfed11b9cd 100644 --- a/core/fpdfapi/parser/cfdf_document.cpp +++ b/core/fpdfapi/parser/cfdf_document.cpp @@ -14,13 +14,12 @@ #include "core/fpdfapi/parser/cpdf_dictionary.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/cfx_readonlymemorystream.h" #include "third_party/base/ptr_util.h" -CFDF_Document::CFDF_Document() - : CPDF_IndirectObjectHolder(), m_pRootDict(nullptr) {} +CFDF_Document::CFDF_Document() = default; -CFDF_Document::~CFDF_Document() {} +CFDF_Document::~CFDF_Document() = default; std::unique_ptr CFDF_Document::CreateNewDoc() { auto pDoc = pdfium::MakeUnique(); @@ -29,10 +28,10 @@ std::unique_ptr CFDF_Document::CreateNewDoc() { return pDoc; } -std::unique_ptr CFDF_Document::ParseMemory(uint8_t* pData, +std::unique_ptr CFDF_Document::ParseMemory(const uint8_t* pData, uint32_t size) { auto pDoc = pdfium::MakeUnique(); - pDoc->ParseStream(pdfium::MakeRetain(pData, size, false)); + pDoc->ParseStream(pdfium::MakeRetain(pData, size)); return pDoc->m_pRootDict ? std::move(pDoc) : nullptr; } diff --git a/core/fpdfapi/parser/cfdf_document.h b/core/fpdfapi/parser/cfdf_document.h index b2cbd5bae9..c1c1b79636 100644 --- a/core/fpdfapi/parser/cfdf_document.h +++ b/core/fpdfapi/parser/cfdf_document.h @@ -19,7 +19,7 @@ class IFX_SeekableReadStream; class CFDF_Document : public CPDF_IndirectObjectHolder { public: static std::unique_ptr CreateNewDoc(); - static std::unique_ptr ParseMemory(uint8_t* pData, + static std::unique_ptr ParseMemory(const uint8_t* pData, uint32_t size); CFDF_Document(); -- cgit v1.2.3