diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-22 16:45:48 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-22 16:45:48 -0400 |
| commit | aa435ba7fe0aacd9102e8c73311c5382ca112439 (patch) | |
| tree | d37573646c6135126d3971358024a70ee222fb21 /core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | |
| parent | 2b11dc1220746d2f6f97a940fc9e4235c8ed4975 (diff) | |
| download | pdfium-aa435ba7fe0aacd9102e8c73311c5382ca112439.tar.xz | |
Merge to XFA: 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 .
(cherry picked from commit 338805f1366dcdf9a5b48cf591541cf98d7490f1)
Review URL: https://codereview.chromium.org/1422513004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 4f54c01ce7..bed3cfbb2c 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -913,9 +913,9 @@ FX_BOOL CPDF_IndexedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) { if (CPDF_String* pString = pTableObj->AsString()) { m_Table = pString->GetString(); - } else if (pTableObj->GetType() == PDFOBJ_STREAM) { + } else if (CPDF_Stream* pStream = pTableObj->AsStream()) { CPDF_StreamAcc acc; - acc.LoadAllData((CPDF_Stream*)pTableObj, FALSE); + acc.LoadAllData(pStream, FALSE); m_Table = CFX_ByteStringC(acc.GetData(), acc.GetSize()); } return TRUE; @@ -1204,8 +1204,8 @@ CPDF_ColorSpace* CPDF_ColorSpace::Load(CPDF_Document* pDoc, CPDF_Object* pObj) { if (pObj->IsName()) return _CSFromName(pObj->GetString()); - if (pObj->GetType() == PDFOBJ_STREAM) { - CPDF_Dictionary* pDict = ((CPDF_Stream*)pObj)->GetDict(); + if (CPDF_Stream* pStream = pObj->AsStream()) { + CPDF_Dictionary* pDict = pStream->GetDict(); if (!pDict) return nullptr; |