commit bba2a7cf30da9e84bcc14ef32dbb0bb944229219
author Dan Sinclair <dsinclair@chromium.org> Tue Feb 07 16:36:39 2017 -0500
committer Chromium commit bot <commit-bot@chromium.org> Wed Feb 08 01:36:02 2017 +0000
tree 94a74de8d07b3e395bf6e08a62811a3a0d652d19
parent 55e026b7b6eec17b012c819c4a7d39e63094b5c4

Update to use CFX_Rect{F} and CFX_Matrix constructors.

This Cl updates the code to use the constructors instead of creating an
empty object and calling Set(). It also removes the various memsets of
the CFX_Rect{F} classes.

Change-Id: I6e20cec00866a38372858dcba5a30d31103172e4
Reviewed-on: https://pdfium-review.googlesource.com/2550
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdfxfa/cpdfxfa_page.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index 8cc3250..8011295 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -156,12 +156,12 @@
   if (!m_pPDFPage && !m_pXFAPageView)
     return;
 
-  CFX_Matrix page2device;
-  CFX_Matrix device2page;
   FX_FLOAT page_x_f, page_y_f;
 
+  CFX_Matrix page2device;
   GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
 
+  CFX_Matrix device2page;
   device2page.SetReverse(page2device);
   device2page.Transform((FX_FLOAT)(device_x), (FX_FLOAT)(device_y), page_x_f,
                         page_y_f);
@@ -182,9 +182,9 @@
   if (!m_pPDFPage && !m_pXFAPageView)
     return;
 
-  CFX_Matrix page2device;
   FX_FLOAT device_x_f, device_y_f;
 
+  CFX_Matrix page2device;
   GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y, rotate);
 
   page2device.Transform(((FX_FLOAT)page_x), ((FX_FLOAT)page_y), device_x_f,
@@ -207,8 +207,7 @@
   switch (nDocType) {
     case DOCTYPE_DYNAMIC_XFA: {
       if (m_pXFAPageView) {
-        CFX_Rect rect;
-        rect.Set(xPos, yPos, xSize, ySize);
+        CFX_Rect rect(xPos, yPos, xSize, ySize);
         m_pXFAPageView->GetDisplayMatrix(matrix, rect, iRotate);
       }
     } break;