From e106b50129d5b8ce50228c67d3b0170bc46c4b2e Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 2 Sep 2016 16:53:09 -0700 Subject: Make CPDF_GeneralStateData private. All interaction goes through the CPDF_GeneralState, which manages the underlying storage transparently to the callers. Make StateData use a real string and a real matrix rather than C-style arrays. Review-Url: https://codereview.chromium.org/2302683002 --- core/fpdfapi/fpdf_render/fpdf_render.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/fpdfapi/fpdf_render') diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 1ac5bfa04c..27c9fa9bd2 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -804,9 +804,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(CPDF_PageObject* pPageObj, bitmap_render.ProcessObjectNoClip(pPageObj, &new_matrix); m_bStopped = bitmap_render.m_bStopped; if (pSMaskDict) { - CFX_Matrix smask_matrix; - FXSYS_memcpy(&smask_matrix, pPageObj->m_GeneralState.GetSMaskMatrix(), - sizeof smask_matrix); + CFX_Matrix smask_matrix = *pPageObj->m_GeneralState.GetSMaskMatrix(); smask_matrix.Concat(*pObj2Device); std::unique_ptr pSMaskSource( LoadSMask(pSMaskDict, &rect, &smask_matrix)); -- cgit v1.2.3