Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fxge/fx_dib.h

 // 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
 
 #ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
 #define CORE_INCLUDE_FXGE_FX_DIB_H_
 
 #include "core/include/fxcrt/fx_basic.h"
@@ skipping 214 matching lines @@
 
   CFX_DIBitmap* CloneConvert(FXDIB_Format format,
                              const FX_RECT* pClip = NULL,
                              void* pIccTransform = NULL) const;
 
   CFX_DIBitmap* StretchTo(int dest_width,
                           int dest_height,
                           FX_DWORD flags = 0,
                           const FX_RECT* pClip = NULL) const;
 
-  CFX_DIBitmap* TransformTo(const CFX_AffineMatrix* pMatrix,
+  CFX_DIBitmap* TransformTo(const CFX_Matrix* pMatrix,
                             int& left,
                             int& top,
                             FX_DWORD flags = 0,
                             const FX_RECT* pClip = NULL) const;
 
   CFX_DIBitmap* GetAlphaMask(const FX_RECT* pClip = NULL) const;
 
   FX_BOOL CopyAlphaMask(const CFX_DIBSource* pAlphaMask,
                         const FX_RECT* pClip = NULL);
 
@@ skipping 386 matching lines @@
   uint8_t* m_pScanline;
   uint8_t* m_pMaskScanline;
   FXDIB_Format m_DestFormat;
 };
 class CFX_ImageTransformer {
  public:
   CFX_ImageTransformer();
   ~CFX_ImageTransformer();
 
   FX_BOOL Start(const CFX_DIBSource* pSrc,
-                const CFX_AffineMatrix* pMatrix,
+                const CFX_Matrix* pMatrix,
                 int flags,
                 const FX_RECT* pClip);
 
   FX_BOOL Continue(IFX_Pause* pPause);
 
-  CFX_AffineMatrix* m_pMatrix;
+  CFX_Matrix* m_pMatrix;
   FX_RECT m_StretchClip;
   int m_ResultLeft;
   int m_ResultTop;
   int m_ResultWidth;
   int m_ResultHeight;
-  CFX_AffineMatrix m_dest2stretch;
+  CFX_Matrix m_dest2stretch;
   CFX_ImageStretcher m_Stretcher;
   CFX_BitmapStorer m_Storer;
   FX_DWORD m_Flags;
   int m_Status;
 };
 class CFX_ImageRenderer {
  public:
   CFX_ImageRenderer();
   ~CFX_ImageRenderer();
 
   FX_BOOL Start(CFX_DIBitmap* pDevice,
                 const CFX_ClipRgn* pClipRgn,
                 const CFX_DIBSource* pSource,
                 int bitmap_alpha,
                 FX_DWORD mask_color,
-                const CFX_AffineMatrix* pMatrix,
+                const CFX_Matrix* pMatrix,
                 FX_DWORD dib_flags,
                 FX_BOOL bRgbByteOrder = FALSE,
                 int alpha_flag = 0,
                 void* pIccTransform = NULL,
                 int blend_type = FXDIB_BLEND_NORMAL);
 
   FX_BOOL Continue(IFX_Pause* pPause);
 
  protected:
   CFX_DIBitmap* m_pDevice;
   const CFX_ClipRgn* m_pClipRgn;
   int m_BitmapAlpha;
   FX_DWORD m_MaskColor;
-  CFX_AffineMatrix m_Matrix;
+  CFX_Matrix m_Matrix;
   CFX_ImageTransformer* m_pTransformer;
   CFX_ImageStretcher m_Stretcher;
   CFX_BitmapComposer m_Composer;
   int m_Status;
   FX_RECT m_ClipBox;
   FX_DWORD m_Flags;
   int m_AlphaFlag;
   void* m_pIccTransform;
   FX_BOOL m_bRgbByteOrder;
   int m_BlendType;
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_DIB_H_