From afb44560a21298b3588b36cbaf45e2be50f2e75b Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 9 Feb 2017 13:07:43 -0500 Subject: Remove Transform in favour of TransformPoint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL removes the two Transform() overrides from CFX_Matrix and calls the TransformPoint methods directly. In the case of the 4 param version the values were assigned to the out values before calling. Change-Id: Id633826caec75b848774dcda6cfdcef2dbf5a7db Reviewed-on: https://pdfium-review.googlesource.com/2573 Reviewed-by: Nicolás Peña Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxge/win32/fx_win32_device.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'core/fxge/win32/fx_win32_device.cpp') diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index c8ceacfc4c..3df38f1965 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -170,9 +170,9 @@ void SetPathToDC(HDC hDC, FX_PATHPOINT* pPoints = pPathData->GetPoints(); for (int i = 0; i < nPoints; i++) { FX_FLOAT posx = pPoints[i].m_PointX, posy = pPoints[i].m_PointY; - if (pMatrix) { - pMatrix->Transform(posx, posy); - } + if (pMatrix) + pMatrix->TransformPoint(posx, posy); + int screen_x = FXSYS_round(posx), screen_y = FXSYS_round(posy); FXPT_TYPE point_type = pPoints[i].m_Type; if (point_type == FXPT_TYPE::MoveTo) { @@ -189,16 +189,16 @@ void SetPathToDC(HDC hDC, lppt[0].y = screen_y; posx = pPoints[i + 1].m_PointX; posy = pPoints[i + 1].m_PointY; - if (pMatrix) { - pMatrix->Transform(posx, posy); - } + if (pMatrix) + pMatrix->TransformPoint(posx, posy); + lppt[1].x = FXSYS_round(posx); lppt[1].y = FXSYS_round(posy); posx = pPoints[i + 2].m_PointX; posy = pPoints[i + 2].m_PointY; - if (pMatrix) { - pMatrix->Transform(posx, posy); - } + if (pMatrix) + pMatrix->TransformPoint(posx, posy); + lppt[2].x = FXSYS_round(posx); lppt[2].y = FXSYS_round(posy); PolyBezierTo(hDC, lppt, 3); @@ -1056,8 +1056,8 @@ bool CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData, FX_FLOAT x2 = pPathData->GetPointX(1); FX_FLOAT y2 = pPathData->GetPointY(1); if (pMatrix) { - pMatrix->Transform(x1, y1); - pMatrix->Transform(x2, y2); + pMatrix->TransformPoint(x1, y1); + pMatrix->TransformPoint(x2, y2); } DrawLine(x1, y1, x2, y2); } else { -- cgit v1.2.3