diff options
author | thestig <thestig@chromium.org> | 2016-05-11 12:59:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-11 12:59:17 -0700 |
commit | a244dfe2ba2cc82ee264475253cc16222e022524 (patch) | |
tree | 3a69928e3c60c5c6f91813aa07518b1af481754b /core/fpdfapi/fpdf_page/fpdf_page_parser.cpp | |
parent | 35c2100a5f6a466635bf99b4e7117d23aeb54d2c (diff) | |
download | pdfium-a244dfe2ba2cc82ee264475253cc16222e022524.tar.xz |
Clean up CPDF_Color and some related code.
- Remove dead code in CPDF_Color.
- Encapsulate member variables.
- Added accessors as need.
- Remove unused CPDF_ColorSpace::GetMaxIndex().
- Remove redundent CPDF_StreamContentParser::GetNumber16().
Review-Url: https://codereview.chromium.org/1965243002
Diffstat (limited to 'core/fpdfapi/fpdf_page/fpdf_page_parser.cpp')
-rw-r--r-- | core/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp index 7ed485c87c..a13fb5021d 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -386,10 +386,6 @@ FX_FLOAT CPDF_StreamContentParser::GetNumber(uint32_t index) { return 0; } -FX_FLOAT CPDF_StreamContentParser::GetNumber16(uint32_t index) { - return GetNumber(index); -} - void CPDF_StreamContentParser::SetGraphicStates(CPDF_PageObject* pObj, FX_BOOL bColor, FX_BOOL bText, @@ -675,10 +671,8 @@ void CPDF_StreamContentParser::Handle_CurveTo_123() { } void CPDF_StreamContentParser::Handle_ConcatMatrix() { - FX_FLOAT a2 = GetNumber16(5), b2 = GetNumber16(4), c2 = GetNumber16(3), - d2 = GetNumber16(2); - FX_FLOAT e2 = GetNumber(1), f2 = GetNumber(0); - CFX_Matrix new_matrix(a2, b2, c2, d2, e2, f2); + CFX_Matrix new_matrix(GetNumber(5), GetNumber(4), GetNumber(3), GetNumber(2), + GetNumber(1), GetNumber(0)); new_matrix.Concat(m_pCurStates->m_CTM); m_pCurStates->m_CTM = new_matrix; OnChangeTextMatrix(); @@ -1366,8 +1360,8 @@ void CPDF_StreamContentParser::Handle_SetTextLeading() { } void CPDF_StreamContentParser::Handle_SetTextMatrix() { - m_pCurStates->m_TextMatrix.Set(GetNumber16(5), GetNumber16(4), GetNumber16(3), - GetNumber16(2), GetNumber(1), GetNumber(0)); + m_pCurStates->m_TextMatrix.Set(GetNumber(5), GetNumber(4), GetNumber(3), + GetNumber(2), GetNumber(1), GetNumber(0)); OnChangeTextMatrix(); m_pCurStates->m_TextX = 0; m_pCurStates->m_TextY = 0; |