From 91ddd3f7501429222f648b986a99f3959a398889 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 29 Aug 2016 12:52:56 -0700 Subject: Use ->() in CPDF_ColorState Move methods to CPDF_ColorStateData. Move MakePrivateCopy() methods to call sites. Remove now-empty cpdf_colorstate.cpp file. Review-Url: https://codereview.chromium.org/2291763002 --- fpdfsdk/fxedit/fxet_edit.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index c744958e5e..97debe1764 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -145,7 +145,8 @@ void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder, rgb[0] = FXARGB_R(crFill) / 255.0f; rgb[1] = FXARGB_G(crFill) / 255.0f; rgb[2] = FXARGB_B(crFill) / 255.0f; - pPathObj->m_ColorState.SetFillColor( + pPathObj->m_ColorState.MakePrivateCopy(); + pPathObj->m_ColorState->SetFillColor( CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3); pPathObj->m_FillType = FXFILL_ALTERNATE; @@ -177,9 +178,11 @@ CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectHolder* pObjectHolder, rgb[0] = FXARGB_R(crText) / 255.0f; rgb[1] = FXARGB_G(crText) / 255.0f; rgb[2] = FXARGB_B(crText) / 255.0f; - pTxtObj->m_ColorState.SetFillColor( + + pTxtObj->m_ColorState.MakePrivateCopy(); + pTxtObj->m_ColorState->SetFillColor( CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3); - pTxtObj->m_ColorState.SetStrokeColor( + pTxtObj->m_ColorState->SetStrokeColor( CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3); pTxtObj->SetPosition(point.x, point.y); -- cgit v1.2.3