diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-29 14:42:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-29 14:42:36 -0700 |
| commit | d24c3a60d0e6e5badef57d3baf55e5c3b6d4882e (patch) | |
| tree | 56abe4fe5e26d4aa18b1921d1f8208065aae0bbd /fpdfsdk/fxedit | |
| parent | 596014357f7cd9ee3245ba8ed52cbc5761151727 (diff) | |
| download | pdfium-d24c3a60d0e6e5badef57d3baf55e5c3b6d4882e.tar.xz | |
Revert "Add -> operators to CFX_CountRef."
This reverts commit c10c23a2b1999b1cb0354fd4db9837dc63a3d833.
TBR=dsinclair@chromium.org
Review-Url: https://codereview.chromium.org/2285283003
Diffstat (limited to 'fpdfsdk/fxedit')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_edit.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index c744958e5e..479fa970a1 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -137,9 +137,8 @@ void AddRectToPageObjects(CPDF_PageObjectHolder* pObjectHolder, FX_COLORREF crFill, const CFX_FloatRect& rcFill) { std::unique_ptr<CPDF_PathObject> pPathObj(new CPDF_PathObject); - pPathObj->m_Path.MakePrivateCopy(); - pPathObj->m_Path->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, - rcFill.top); + CFX_PathData* pPathData = pPathObj->m_Path.GetPrivateCopy(); + pPathData->AppendRect(rcFill.left, rcFill.bottom, rcFill.right, rcFill.top); FX_FLOAT rgb[3]; rgb[0] = FXARGB_R(crFill) / 255.0f; @@ -162,16 +161,16 @@ CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectHolder* pObjectHolder, const CFX_FloatPoint& point, const CFX_ByteString& text) { std::unique_ptr<CPDF_TextObject> pTxtObj(new CPDF_TextObject); - pTxtObj->m_TextState.MakePrivateCopy(); - pTxtObj->m_TextState->m_pFont = pFont; - pTxtObj->m_TextState->m_FontSize = fFontSize; - pTxtObj->m_TextState->m_CharSpace = fCharSpace; - pTxtObj->m_TextState->m_WordSpace = 0; - pTxtObj->m_TextState->m_TextMode = TextRenderingMode::MODE_FILL; - pTxtObj->m_TextState->m_Matrix[0] = nHorzScale / 100.0f; - pTxtObj->m_TextState->m_Matrix[1] = 0; - pTxtObj->m_TextState->m_Matrix[2] = 0; - pTxtObj->m_TextState->m_Matrix[3] = 1; + CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetPrivateCopy(); + pTextStateData->m_pFont = pFont; + pTextStateData->m_FontSize = fFontSize; + pTextStateData->m_CharSpace = fCharSpace; + pTextStateData->m_WordSpace = 0; + pTextStateData->m_TextMode = TextRenderingMode::MODE_FILL; + pTextStateData->m_Matrix[0] = nHorzScale / 100.0f; + pTextStateData->m_Matrix[1] = 0; + pTextStateData->m_Matrix[2] = 0; + pTextStateData->m_Matrix[3] = 1; FX_FLOAT rgb[3]; rgb[0] = FXARGB_R(crText) / 255.0f; |