diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-22 15:34:16 -0400 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-22 15:34:16 -0400 |
commit | 338805f1366dcdf9a5b48cf591541cf98d7490f1 (patch) | |
tree | 161b722bbb0628b290084b20fa8aa8f1d436c896 /core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | |
parent | c6d8683dbdd922c86375fb0520d420de13d683ed (diff) | |
download | pdfium-338805f1366dcdf9a5b48cf591541cf98d7490f1.tar.xz |
Add type cast definitions for CPDF_Stream.
This Cl adds ToStream, CPDF_Object::AsStream and CPDF_Object::IsStream and
updates the src to use them as needed.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1402413004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index c27ede44cb..b86d00851c 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -960,10 +960,10 @@ void CPDF_ContentParser::Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions) { m_Status = Done; return; } - if (pContent->GetType() == PDFOBJ_STREAM) { + if (CPDF_Stream* pStream = pContent->AsStream()) { m_nStreams = 0; m_pSingleStream = new CPDF_StreamAcc; - m_pSingleStream->LoadAllData((CPDF_Stream*)pContent, FALSE); + m_pSingleStream->LoadAllData(pStream, FALSE); } else if (CPDF_Array* pArray = pContent->AsArray()) { m_nStreams = pArray->GetCount(); if (m_nStreams == 0) { @@ -1078,9 +1078,8 @@ void CPDF_ContentParser::Continue(IFX_Pause* pPause) { CPDF_Array* pContent = m_pObjects->m_pFormDict->GetArray(FX_BSTRC("Contents")); m_pStreamArray[m_CurrentOffset] = new CPDF_StreamAcc; - CPDF_Stream* pStreamObj = - (CPDF_Stream*)(pContent ? pContent->GetElementValue(m_CurrentOffset) - : NULL); + CPDF_Stream* pStreamObj = ToStream( + pContent ? pContent->GetElementValue(m_CurrentOffset) : nullptr); m_pStreamArray[m_CurrentOffset]->LoadAllData(pStreamObj, FALSE); m_CurrentOffset++; } |