Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/fpdfview.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "public/fpdfview.h"
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
@@ skipping 752 matching lines @@
                                          int device_y,
                                          double* page_x,
                                          double* page_y) {
   if (page == NULL || page_x == NULL || page_y == NULL)
     return;
   UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page);
 #ifdef PDF_ENABLE_XFA
   pPage->DeviceToPage(start_x, start_y, size_x, size_y, rotate, device_x,
                       device_y, page_x, page_y);
 #else   // PDF_ENABLE_XFA
-  CPDF_Matrix page2device;
+  CFX_Matrix page2device;
   pPage->GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y,
                           rotate);
-  CPDF_Matrix device2page;
+  CFX_Matrix device2page;
   device2page.SetReverse(page2device);
   FX_FLOAT page_x_f, page_y_f;
   device2page.Transform((FX_FLOAT)(device_x), (FX_FLOAT)(device_y), page_x_f,
                         page_y_f);
   *page_x = (page_x_f);
   *page_y = (page_y_f);
 #endif  // PDF_ENABLE_XFA
 }
 
 DLLEXPORT void STDCALL FPDF_PageToDevice(FPDF_PAGE page,
                                          int start_x,
                                          int start_y,
                                          int size_x,
                                          int size_y,
                                          int rotate,
                                          double page_x,
                                          double page_y,
                                          int* device_x,
                                          int* device_y) {
   if (!device_x || !device_y)
     return;
   UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page);
   if (!pPage)
     return;
 #ifdef PDF_ENABLE_XFA
   pPage->PageToDevice(start_x, start_y, size_x, size_y, rotate, page_x, page_y,
                       device_x, device_y);
 #else   // PDF_ENABLE_XFA
-  CPDF_Matrix page2device;
+  CFX_Matrix page2device;
   pPage->GetDisplayMatrix(page2device, start_x, start_y, size_x, size_y,
                           rotate);
   FX_FLOAT device_x_f, device_y_f;
   page2device.Transform(((FX_FLOAT)page_x), ((FX_FLOAT)page_y), device_x_f,
                         device_y_f);
   *device_x = FXSYS_round(device_x_f);
   *device_y = FXSYS_round(device_y_f);
 #endif  // PDF_ENABLE_XFA
 }
 
@@ skipping 122 matching lines @@
     pContext->m_pOptions->m_ColorMode = RENDER_COLOR_GRAY;
     pContext->m_pOptions->m_ForeColor = 0;
     pContext->m_pOptions->m_BackColor = 0xffffff;
   }
   const CPDF_OCContext::UsageType usage =
       (flags & FPDF_PRINTING) ? CPDF_OCContext::Print : CPDF_OCContext::View;
   pContext->m_pOptions->m_AddFlags = flags >> 8;
   pContext->m_pOptions->m_pOCContext =
       new CPDF_OCContext(pPage->m_pDocument, usage);
 
-  CFX_AffineMatrix matrix;
+  CFX_Matrix matrix;
   pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
 
   FX_RECT clip;
   clip.left = start_x;
   clip.right = start_x + size_x;
   clip.top = start_y;
   clip.bottom = start_y + size_y;
   pContext->m_pDevice->SaveState();
   pContext->m_pDevice->SetClip_Rect(&clip);
 
@@ skipping 229 matching lines @@
   if (!buffer) {
     *buflen = len;
   } else if (*buflen >= len) {
     memcpy(buffer, utf16Name.c_str(), len);
     *buflen = len;
   } else {
     *buflen = -1;
   }
   return (FPDF_DEST)pDestObj;
 }