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

Unified Diff: core/include/fpdfapi/fpdf_resource.h

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, 3 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 | « no previous file | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/include/fpdfapi/fpdf_resource.h
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 4ce4ddc8bb519f2152384c7f9cc93485261a0f74..92c4872537af31ee832bb15bdaf33f8c04b247ce 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -680,10 +680,8 @@ class CPDF_Color : public CFX_Object
{
public:
- CPDF_Color()
+ CPDF_Color() :m_pCS(NULL), m_pBuffer(NULL), m_pDocument(NULL)
{
- m_pBuffer = NULL;
- m_pCS = NULL;
}
CPDF_Color(int family);
@@ -720,10 +718,11 @@ public:
CPDF_ColorSpace* m_pCS;
- FX_FLOAT* m_pBuffer;
protected:
void ReleaseBuffer();
void ReleaseColorSpace();
+ FX_FLOAT* m_pBuffer;
+ CPDF_Document* m_pDocument;
};
#define PATTERN_TILING 1
#define PATTERN_SHADING 2
@@ -732,7 +731,6 @@ class CPDF_Pattern : public CFX_Object
public:
virtual ~CPDF_Pattern();
- void SaveColor(CPDF_Color* pColor) {m_pColor = pColor;}
CPDF_Object* m_pPatternObj;
@@ -742,7 +740,6 @@ public:
CFX_AffineMatrix m_ParentMatrix;
CPDF_Document* m_pDocument;
- CPDF_Color* m_pColor;
protected:
« no previous file with comments | « no previous file | core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698