2 files changed, 25 insertions, 25 deletions

diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/ge/cfx_pathdata.cpp
index d1391850c0..14eabb990a 100644
--- a/core/fxge/ge/cfx_pathdata.cpp
+++ b/core/fxge/ge/cfx_pathdata.cpp
@@ -65,8 +65,8 @@ void CFX_PathData::Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix) {
                pSrc->m_PointCount * sizeof(FX_PATHPOINT));
   if (pMatrix) {
     for (int i = 0; i < pSrc->m_PointCount; i++) {
-      pMatrix->Transform(m_pPoints[old_count + i].m_PointX,
-                         m_pPoints[old_count + i].m_PointY);
+      pMatrix->TransformPoint(m_pPoints[old_count + i].m_PointX,
+                              m_pPoints[old_count + i].m_PointY);
     }
   }
 }
@@ -316,7 +316,7 @@ void CFX_PathData::Transform(const CFX_Matrix* pMatrix) {
     return;
   }
   for (int i = 0; i < m_PointCount; i++) {
-    pMatrix->Transform(m_pPoints[i].m_PointX, m_pPoints[i].m_PointY);
+    pMatrix->TransformPoint(m_pPoints[i].m_PointX, m_pPoints[i].m_PointY);
   }
 }
 
@@ -497,9 +497,9 @@ bool CFX_PathData::IsRect() const {
 bool CFX_PathData::IsRect(const CFX_Matrix* pMatrix,
                           CFX_FloatRect* pRect) const {
   if (!pMatrix) {
-    if (!IsRect()) {
+    if (!IsRect())
       return false;
-    }
+
     if (pRect) {
       pRect->left = m_pPoints[0].m_PointX;
       pRect->right = m_pPoints[2].m_PointX;
@@ -509,9 +509,10 @@ bool CFX_PathData::IsRect(const CFX_Matrix* pMatrix,
     }
     return true;
   }
-  if (m_PointCount != 5 && m_PointCount != 4) {
+
+  if (m_PointCount != 5 && m_PointCount != 4)
     return false;
-  }
+
   if ((m_PointCount == 5 && (m_pPoints[0].m_PointX != m_pPoints[4].m_PointX ||
                              m_pPoints[0].m_PointY != m_pPoints[4].m_PointY)) ||
       (m_pPoints[1].m_PointX == m_pPoints[3].m_PointX &&
@@ -522,19 +523,21 @@ bool CFX_PathData::IsRect(const CFX_Matrix* pMatrix,
       m_pPoints[0].m_PointY != m_pPoints[3].m_PointY) {
     return false;
   }
-  FX_FLOAT x[5], y[5];
+
+  FX_FLOAT x[5];
+  FX_FLOAT y[5];
   for (int i = 0; i < m_PointCount; i++) {
-    pMatrix->Transform(m_pPoints[i].m_PointX, m_pPoints[i].m_PointY, x[i],
-                       y[i]);
+    x[i] = m_pPoints[i].m_PointX;
+    y[i] = m_pPoints[i].m_PointY;
+    pMatrix->TransformPoint(x[i], y[i]);
     if (i) {
-      if (m_pPoints[i].m_Type != FXPT_TYPE::LineTo) {
+      if (m_pPoints[i].m_Type != FXPT_TYPE::LineTo)
         return false;
-      }
-      if (x[i] != x[i - 1] && y[i] != y[i - 1]) {
+      if (x[i] != x[i - 1] && y[i] != y[i - 1])
         return false;
-      }
     }
   }
+
   if (pRect) {
     pRect->left = x[0];
     pRect->right = x[2];
diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp
index 52ed8c37c0..0c73c7a66a 100644
--- a/core/fxge/ge/cfx_renderdevice.cpp
+++ b/core/fxge/ge/cfx_renderdevice.cpp
@@ -475,21 +475,18 @@ bool CFX_RenderDevice::DrawPathWithBlend(const CFX_PathData* pPathData,
   uint8_t fill_alpha = (fill_mode & 3) ? FXARGB_A(fill_color) : 0;
   if (stroke_alpha == 0 && pPathData->GetPointCount() == 2) {
     FX_PATHPOINT* pPoints = pPathData->GetPoints();
-    FX_FLOAT x1, x2, y1, y2;
+    FX_FLOAT x1 = pPoints[0].m_PointX;
+    FX_FLOAT y1 = pPoints[0].m_PointY;
+    FX_FLOAT x2 = pPoints[1].m_PointX;
+    FX_FLOAT y2 = pPoints[1].m_PointY;
     if (pObject2Device) {
-      pObject2Device->Transform(pPoints[0].m_PointX, pPoints[0].m_PointY, x1,
-                                y1);
-      pObject2Device->Transform(pPoints[1].m_PointX, pPoints[1].m_PointY, x2,
-                                y2);
-    } else {
-      x1 = pPoints[0].m_PointX;
-      y1 = pPoints[0].m_PointY;
-      x2 = pPoints[1].m_PointX;
-      y2 = pPoints[1].m_PointY;
+      pObject2Device->TransformPoint(x1, y1);
+      pObject2Device->TransformPoint(x2, y2);
     }
     DrawCosmeticLine(x1, y1, x2, y2, fill_color, fill_mode, blend_type);
     return true;
   }
+
   if ((pPathData->GetPointCount() == 5 || pPathData->GetPointCount() == 4) &&
       stroke_alpha == 0) {
     CFX_FloatRect rect_f;
@@ -913,7 +910,7 @@ bool CFX_RenderDevice::DrawNormalText(int nChars,
     const FXTEXT_CHARPOS& charpos = pCharPos[i];
     glyph.m_fOriginX = charpos.m_OriginX;
     glyph.m_fOriginY = charpos.m_OriginY;
-    text2Device.Transform(glyph.m_fOriginX, glyph.m_fOriginY);
+    text2Device.TransformPoint(glyph.m_fOriginX, glyph.m_fOriginY);
     if (anti_alias < FXFT_RENDER_MODE_LCD)
       glyph.m_OriginX = FXSYS_round(glyph.m_fOriginX);
     else