diff options
author | tsepez <tsepez@chromium.org> | 2016-08-29 14:07:28 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-29 14:07:28 -0700 |
commit | adbd32950006075fc04ff2cbb01bf3a099f0e010 (patch) | |
tree | 62ad8839a0190a8cf5e2b0823276e4ba2dbd99a2 /core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp | |
parent | dda2c0dc502b50d4de66b80305441bfb612ec6c1 (diff) | |
download | pdfium-adbd32950006075fc04ff2cbb01bf3a099f0e010.tar.xz |
Revert "Use ->() in CPDF_ColorState"
This reverts commit 91ddd3f7501429222f648b986a99f3959a398889.
Reason for revert: may introduce sublte bugs, more thought required.
TBR=dsinclair@chromium.org
Review-Url: https://codereview.chromium.org/2294553002
Diffstat (limited to 'core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp | 74 |
1 files changed, 5 insertions, 69 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp index 3a771ffaf0..9dbcdec267 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp @@ -6,79 +6,15 @@ #include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h" -#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h" -#include "core/fxge/include/fx_dib.h" - -CPDF_ColorStateData::CPDF_ColorStateData(const CPDF_ColorStateData& src) - : m_FillRGB(src.m_FillRGB), m_StrokeRGB(src.m_StrokeRGB) { +CPDF_ColorStateData::CPDF_ColorStateData(const CPDF_ColorStateData& src) { m_FillColor.Copy(&src.m_FillColor); + m_FillRGB = src.m_FillRGB; m_StrokeColor.Copy(&src.m_StrokeColor); + m_StrokeRGB = src.m_StrokeRGB; } -void CPDF_ColorStateData::SetDefault() { - m_FillRGB = 0; - m_StrokeRGB = 0; +void CPDF_ColorStateData::Default() { + m_FillRGB = m_StrokeRGB = 0; m_FillColor.SetColorSpace(CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY)); m_StrokeColor.SetColorSpace(CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY)); } - -void CPDF_ColorStateData::SetFillColor(CPDF_ColorSpace* pCS, - FX_FLOAT* pValue, - uint32_t nValues) { - SetColor(m_FillColor, m_FillRGB, pCS, pValue, nValues); -} - -void CPDF_ColorStateData::SetStrokeColor(CPDF_ColorSpace* pCS, - FX_FLOAT* pValue, - uint32_t nValues) { - SetColor(m_StrokeColor, m_StrokeRGB, pCS, pValue, nValues); -} - -void CPDF_ColorStateData::SetFillPattern(CPDF_Pattern* pPattern, - FX_FLOAT* pValue, - uint32_t nValues) { - m_FillColor.SetValue(pPattern, pValue, nValues); - int R, G, B; - FX_BOOL ret = m_FillColor.GetRGB(R, G, B); - if (CPDF_TilingPattern* pTilingPattern = pPattern->AsTilingPattern()) { - if (!ret && pTilingPattern->colored()) { - m_FillRGB = 0x00BFBFBF; - return; - } - } - m_FillRGB = ret ? FXSYS_RGB(R, G, B) : (uint32_t)-1; -} - -void CPDF_ColorStateData::SetStrokePattern(CPDF_Pattern* pPattern, - FX_FLOAT* pValue, - uint32_t nValues) { - m_StrokeColor.SetValue(pPattern, pValue, nValues); - int R, G, B; - FX_BOOL ret = m_StrokeColor.GetRGB(R, G, B); - if (CPDF_TilingPattern* pTilingPattern = pPattern->AsTilingPattern()) { - if (!ret && pTilingPattern->colored()) { - m_StrokeRGB = 0x00BFBFBF; - return; - } - } - m_StrokeRGB = - m_StrokeColor.GetRGB(R, G, B) ? FXSYS_RGB(R, G, B) : (uint32_t)-1; -} - -void CPDF_ColorStateData::SetColor(CPDF_Color& color, - uint32_t& rgb, - CPDF_ColorSpace* pCS, - FX_FLOAT* pValue, - uint32_t nValues) { - if (pCS) { - color.SetColorSpace(pCS); - } else if (color.IsNull()) { - color.SetColorSpace(CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY)); - } - if (color.GetColorSpace()->CountComponents() > nValues) - return; - - color.SetValue(pValue); - int R, G, B; - rgb = color.GetRGB(R, G, B) ? FXSYS_RGB(R, G, B) : (uint32_t)-1; -} |