From c064d54cd169390039eedae422bbb132f771d20a Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Wed, 8 Nov 2017 15:49:51 +0000 Subject: Use MaybeOwned in CPDF_ContentParser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7e5daeafd70ef29bcc9bdebbae004fa4b946b83d Reviewed-on: https://pdfium-review.googlesource.com/18019 Reviewed-by: Tom Sepez Commit-Queue: Nicolás Peña Moreno --- core/fpdfapi/parser/cpdf_stream_acc.cpp | 14 +++++++++++--- core/fpdfapi/parser/cpdf_stream_acc.h | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'core/fpdfapi/parser') diff --git a/core/fpdfapi/parser/cpdf_stream_acc.cpp b/core/fpdfapi/parser/cpdf_stream_acc.cpp index ccc3fdae53..91d458f9a7 100644 --- a/core/fpdfapi/parser/cpdf_stream_acc.cpp +++ b/core/fpdfapi/parser/cpdf_stream_acc.cpp @@ -61,9 +61,11 @@ CPDF_StreamAcc::~CPDF_StreamAcc() { } const uint8_t* CPDF_StreamAcc::GetData() const { - if (m_bNewBuf) - return m_pData; - return m_pStream ? m_pStream->GetRawData() : nullptr; + return GetDataHelper(); +} + +uint8_t* CPDF_StreamAcc::GetData() { + return GetDataHelper(); } uint32_t CPDF_StreamAcc::GetSize() const { @@ -83,3 +85,9 @@ std::unique_ptr CPDF_StreamAcc::DetachData() { memcpy(p.get(), m_pData, m_dwSize); return p; } + +uint8_t* CPDF_StreamAcc::GetDataHelper() const { + if (m_bNewBuf) + return m_pData; + return m_pStream ? m_pStream->GetRawData() : nullptr; +} diff --git a/core/fpdfapi/parser/cpdf_stream_acc.h b/core/fpdfapi/parser/cpdf_stream_acc.h index a8a2540880..c270285345 100644 --- a/core/fpdfapi/parser/cpdf_stream_acc.h +++ b/core/fpdfapi/parser/cpdf_stream_acc.h @@ -33,6 +33,7 @@ class CPDF_StreamAcc : public Retainable { } const uint8_t* GetData() const; + uint8_t* GetData(); uint32_t GetSize() const; const ByteString& GetImageDecoder() const { return m_ImageDecoder; } const CPDF_Dictionary* GetImageParam() const { return m_pImageParam; } @@ -42,6 +43,9 @@ class CPDF_StreamAcc : public Retainable { explicit CPDF_StreamAcc(const CPDF_Stream* pStream); ~CPDF_StreamAcc() override; + private: + uint8_t* GetDataHelper() const; + uint8_t* m_pData; uint32_t m_dwSize; bool m_bNewBuf; -- cgit v1.2.3