diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-15 16:59:30 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-15 16:59:30 -0700 |
commit | 98e77014d4732e3e8c85d14169090f058f5469d3 (patch) | |
tree | ec3ddf881c0506bc53397b01d92135ae08ea0681 /core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | |
parent | 75f43c4c0a733d267122120af26631ded87c8af2 (diff) | |
download | pdfium-98e77014d4732e3e8c85d14169090f058f5469d3.tar.xz |
Merge to XFA: Make ContentStreamParser members private, fix constructor
(cherry picked from commit 5b4f57cdc0a279bd9b8e03b8f5714b9d39e642a8)
Original Review URL: https://codereview.chromium.org/1219683007 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1235593004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index 70d0743f58..b4d030e679 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -8,8 +8,9 @@ #include "../../../include/fpdfapi/fpdf_pageobj.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_render.h" -#include "pageint.h" #include "../fpdf_render/render_int.h" +#include "pageint.h" + void CPDF_GraphicStates::DefaultStates() { m_ColorState.New()->Default(); @@ -544,14 +545,14 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS, CPDF_StreamContentParser } pGeneralState->SetBlendMode(mode); if (pGeneralState->m_BlendType > FXDIB_BLEND_MULTIPLY) { - pParser->m_pObjectList->m_bBackgroundAlphaNeeded = TRUE; + pParser->GetObjectList()->m_bBackgroundAlphaNeeded = TRUE; } break; } case FXBSTR_ID('S', 'M', 'a', 's'): if (pObject && pObject->GetType() == PDFOBJ_DICTIONARY) { pGeneralState->m_pSoftMask = pObject; - FXSYS_memcpy(pGeneralState->m_SMaskMatrix, &pParser->m_pCurStates->m_CTM, sizeof(CPDF_Matrix)); + FXSYS_memcpy(pGeneralState->m_SMaskMatrix, &pParser->GetCurStates()->m_CTM, sizeof(CPDF_Matrix)); } else { pGeneralState->m_pSoftMask = NULL; } |