diff options
Diffstat (limited to 'fpdfsdk/pwl')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.cpp | 7 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.cpp | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp index f26811e137..5d7a44c623 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.cpp +++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp @@ -468,11 +468,8 @@ void CPWL_EditImpl::DrawEdit(CFX_RenderDevice* pDevice, int32_t nFontIndex = -1; CFX_PointF ptBT; CFX_RenderDevice::StateRestorer restorer(pDevice); - if (!rcClip.IsEmpty()) { - CFX_FloatRect rcTemp = rcClip; - mtUser2Device.TransformRect(rcTemp); - pDevice->SetClip_Rect(rcTemp.ToFxRect()); - } + if (!rcClip.IsEmpty()) + pDevice->SetClip_Rect(mtUser2Device.TransformRect(rcClip).ToFxRect()); CPWL_EditImpl_Iterator* pIterator = pEdit->GetIterator(); IPVT_FontMap* pFontMap = pEdit->GetFontMap(); diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 96a3720daf..0198c63d6a 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -738,9 +738,8 @@ CFX_Matrix CPWL_Wnd::GetWindowMatrix() const { } FX_RECT CPWL_Wnd::PWLtoWnd(const CFX_FloatRect& rect) const { - CFX_FloatRect rcTemp = rect; CFX_Matrix mt = GetWindowMatrix(); - mt.TransformRect(rcTemp); + CFX_FloatRect rcTemp = mt.TransformRect(rect); return FX_RECT((int32_t)(rcTemp.left + 0.5), (int32_t)(rcTemp.bottom + 0.5), (int32_t)(rcTemp.right + 0.5), (int32_t)(rcTemp.top + 0.5)); } @@ -764,9 +763,8 @@ CFX_FloatRect CPWL_Wnd::ParentToChild(const CFX_FloatRect& rect) const { CFX_Matrix inverse = mt.GetInverse(); if (!inverse.IsIdentity()) mt = inverse; - CFX_FloatRect rc = rect; - mt.TransformRect(rc); - return rc; + + return mt.TransformRect(rect); } CFX_Matrix CPWL_Wnd::GetChildToRoot() const { |