diff options
Diffstat (limited to 'core/fpdfapi/fpdf_page/include')
-rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_color.h | 16 | ||||
-rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_colorspace.h | 1 |
2 files changed, 5 insertions, 12 deletions
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_color.h b/core/fpdfapi/fpdf_page/include/cpdf_color.h index 9e20684d83..89c0eac730 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; }; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h index 6be55f47b9..48ace36835 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h @@ -79,7 +79,6 @@ class CPDF_ColorSpace { FX_BOOL bTransMask = FALSE) const; CPDF_Array*& GetArray() { return m_pArray; } - int GetMaxIndex() const; virtual CPDF_ColorSpace* GetBaseCS() const { return NULL; } virtual void EnableStdConversion(FX_BOOL bEnabled); |