Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(961)

Unified Diff: core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp

Issue 522483003: Add m_pDocument in CPDF_Color and check if page date has been forced clear (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/include/fpdfapi/fpdf_resource.h ('k') | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index d99e64304719d7a21cd054537f30e697ac484c27..a5e37447a6bc1885e1246ec71d301a17e7b7ab33 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -1292,9 +1292,11 @@ void CPDF_Color::ReleaseBuffer()
if (m_pCS->GetFamily() == PDFCS_PATTERN) {
PatternValue* pvalue = (PatternValue*)m_pBuffer;
CPDF_Pattern* pPattern = pvalue->m_pPattern;
- if (pPattern && pPattern->m_pDocument) {
- pPattern->SaveColor(NULL);
- pPattern->m_pDocument->GetPageData()->ReleasePattern(pPattern->m_pPatternObj);
+ if (pPattern && m_pDocument) {
+ CPDF_DocPageData *pPageData = m_pDocument->GetPageData();
+ if (!pPageData->IsForceClear()) {
jun_fang 2014/09/01 22:44:03 need to check whether pPageData is NULL?
+ pPageData->ReleasePattern(pPattern->m_pPatternObj);
+ }
}
}
FX_Free(m_pBuffer);
@@ -1302,9 +1304,10 @@ void CPDF_Color::ReleaseBuffer()
}
void CPDF_Color::ReleaseColorSpace()
{
- if (m_pCS && m_pCS->m_pDocument && m_pCS->GetArray()) {
- m_pCS->m_pDocument->GetPageData()->ReleaseColorSpace(m_pCS->GetArray());
+ if (m_pDocument && m_pCS && m_pCS->GetArray()) {
+ m_pDocument->GetPageData()->ReleaseColorSpace(m_pCS->GetArray());
m_pCS = NULL;
+ m_pDocument = NULL;
}
}
void CPDF_Color::SetColorSpace(CPDF_ColorSpace* pCS)
@@ -1315,11 +1318,13 @@ void CPDF_Color::SetColorSpace(CPDF_ColorSpace* pCS)
}
ReleaseColorSpace();
m_pCS = pCS;
+ m_pDocument = pCS->m_pDocument;
return;
}
ReleaseBuffer();
ReleaseColorSpace();
m_pCS = pCS;
+ m_pDocument = pCS->m_pDocument;
if (m_pCS) {
m_pBuffer = pCS->CreateBuf();
pCS->GetDefaultColor(m_pBuffer);
@@ -1346,18 +1351,15 @@ void CPDF_Color::SetValue(CPDF_Pattern* pPattern, FX_FLOAT* comps, int ncomps)
m_pCS = CPDF_ColorSpace::GetStockCS(PDFCS_PATTERN);
m_pBuffer = m_pCS->CreateBuf();
}
- CPDF_DocPageData* pDocPageData = NULL;
PatternValue* pvalue = (PatternValue*)m_pBuffer;
- if (pvalue->m_pPattern && pvalue->m_pPattern->m_pDocument) {
- pDocPageData = pvalue->m_pPattern->m_pDocument->GetPageData();
- pvalue->m_pPattern->SaveColor(NULL);
- pDocPageData->ReleasePattern(pvalue->m_pPattern->m_pPatternObj);
+ if (pvalue->m_pPattern && m_pDocument) {
+ CPDF_DocPageData *pDocPageData = m_pDocument->GetPageData();
+ if (pDocPageData && pDocPageData->IsForceClear()) {
jun_fang 2014/09/01 22:44:03 should be "!pDocPageData->IsForceClear()"?
+ pDocPageData->ReleasePattern(pvalue->m_pPattern->m_pPatternObj);
+ }
}
pvalue->m_nComps = ncomps;
pvalue->m_pPattern = pPattern;
- if (pPattern) {
- pPattern->SaveColor(this);
- }
if (ncomps) {
FXSYS_memcpy32(pvalue->m_Comps, comps, ncomps * sizeof(FX_FLOAT));
}
@@ -1380,8 +1382,8 @@ void CPDF_Color::Copy(const CPDF_Color* pSrc)
FXSYS_memcpy32(m_pBuffer, pSrc->m_pBuffer, m_pCS->GetBufSize());
if (m_pCS->GetFamily() == PDFCS_PATTERN) {
PatternValue* pvalue = (PatternValue*)m_pBuffer;
- if (pvalue->m_pPattern && pvalue->m_pPattern->m_pDocument) {
- pvalue->m_pPattern = pvalue->m_pPattern->m_pDocument->GetPageData()->GetPattern(pvalue->m_pPattern->m_pPatternObj, FALSE, &pvalue->m_pPattern->m_ParentMatrix);
+ if (pvalue->m_pPattern && m_pDocument) {
+ pvalue->m_pPattern = m_pDocument->GetPageData()->GetPattern(pvalue->m_pPattern->m_pPatternObj, FALSE, &pvalue->m_pPattern->m_ParentMatrix);
}
}
}
« no previous file with comments | « core/include/fpdfapi/fpdf_resource.h ('k') | core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698