From 4734512572776f8fc705e28fba8a46d981372e99 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 24 May 2017 14:07:18 -0700 Subject: Convert to CFX_UnownedPtr, part 8 Change-Id: I99d6b4df72e369652301c36e4046f03ef95ed07d Reviewed-on: https://pdfium-review.googlesource.com/5837 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- core/fpdfapi/page/cpdf_color.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'core/fpdfapi/page/cpdf_color.cpp') diff --git a/core/fpdfapi/page/cpdf_color.cpp b/core/fpdfapi/page/cpdf_color.cpp index ca0e621530..7e0675df15 100644 --- a/core/fpdfapi/page/cpdf_color.cpp +++ b/core/fpdfapi/page/cpdf_color.cpp @@ -42,12 +42,17 @@ void CPDF_Color::ReleaseBuffer() { } void CPDF_Color::ReleaseColorSpace() { - if (!m_pCS || !m_pCS->m_pDocument) + if (!m_pCS) + return; + + CPDF_Document* pDoc = m_pCS->GetDocument(); + if (!pDoc) return; - auto* pPageData = m_pCS->m_pDocument->GetPageData(); + auto* pPageData = pDoc->GetPageData(); if (pPageData) pPageData->ReleaseColorSpace(m_pCS->GetArray()); + m_pCS = nullptr; } @@ -111,16 +116,17 @@ void CPDF_Color::SetValue(CPDF_Pattern* pPattern, float* comps, int ncomps) { void CPDF_Color::Copy(const CPDF_Color* pSrc) { ReleaseBuffer(); ReleaseColorSpace(); - m_pCS = pSrc->m_pCS; - if (m_pCS && m_pCS->m_pDocument) { - CPDF_Array* pArray = m_pCS->GetArray(); - if (pArray) - m_pCS = m_pCS->m_pDocument->GetPageData()->GetCopiedColorSpace(pArray); - } if (!m_pCS) return; + CPDF_Document* pDoc = m_pCS->GetDocument(); + CPDF_Array* pArray = m_pCS->GetArray(); + if (pDoc && pArray) { + m_pCS = pDoc->GetPageData()->GetCopiedColorSpace(pArray); + if (!m_pCS) + return; + } m_pBuffer = m_pCS->CreateBuf(); memcpy(m_pBuffer, pSrc->m_pBuffer, m_pCS->GetBufSize()); if (m_pCS->GetFamily() != PDFCS_PATTERN) @@ -128,10 +134,11 @@ void CPDF_Color::Copy(const CPDF_Color* pSrc) { PatternValue* pValue = reinterpret_cast(m_pBuffer); CPDF_Pattern* pPattern = pValue->m_pPattern; - if (pPattern) { - pValue->m_pPattern = pPattern->document()->GetPageData()->GetPattern( - pPattern->pattern_obj(), false, pPattern->parent_matrix()); - } + if (!pPattern) + return; + + pValue->m_pPattern = pPattern->document()->GetPageData()->GetPattern( + pPattern->pattern_obj(), false, pPattern->parent_matrix()); } bool CPDF_Color::GetRGB(int* R, int* G, int* B) const { -- cgit v1.2.3