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

Unified Diff: core/fpdfapi/fpdf_page/include/cpdf_color.h

Issue 1965243002: Clean up CPDF_Color and some related code. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 4 years, 7 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/fpdfapi/fpdf_page/fpdf_page_parser.cpp ('k') | core/fpdfapi/fpdf_page/include/cpdf_colorspace.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_page/include/cpdf_color.h
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_color.h b/core/fpdfapi/fpdf_page/include/cpdf_color.h
index 9e20684d839f4b58dafc367c2a28f400e9b58c70..89c0eac7307ab2f18a1d59b14f50c40614de8627 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_color.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_color.h
@@ -14,15 +14,11 @@ class CPDF_Pattern;
class CPDF_Color {
public:
- CPDF_Color() : m_pCS(nullptr), m_pBuffer(nullptr) {}
- explicit CPDF_Color(int family);
+ CPDF_Color();
~CPDF_Color();
- FX_BOOL IsNull() const { return !m_pBuffer; }
- FX_BOOL IsEqual(const CPDF_Color& other) const;
- FX_BOOL IsPattern() const {
- return m_pCS && m_pCS->GetFamily() == PDFCS_PATTERN;
- }
+ bool IsNull() const { return !m_pBuffer; }
+ bool IsPattern() const;
void Copy(const CPDF_Color* pSrc);
@@ -32,15 +28,13 @@ class CPDF_Color {
FX_BOOL GetRGB(int& R, int& G, int& B) const;
CPDF_Pattern* GetPattern() const;
- CPDF_ColorSpace* GetPatternCS() const;
- FX_FLOAT* GetPatternColor() const;
-
- CPDF_ColorSpace* m_pCS;
+ const CPDF_ColorSpace* GetColorSpace() const { return m_pCS; }
protected:
void ReleaseBuffer();
void ReleaseColorSpace();
+ CPDF_ColorSpace* m_pCS;
FX_FLOAT* m_pBuffer;
};
« no previous file with comments | « core/fpdfapi/fpdf_page/fpdf_page_parser.cpp ('k') | core/fpdfapi/fpdf_page/include/cpdf_colorspace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698