Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_pageobj.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_FPDFAPI_FPDF_PAGEOBJ_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
 
 #include "core/include/fxge/fx_ge.h"
@@ skipping 34 matching lines @@
 
   FX_PATHPOINT* GetPoints() { return m_pObject->m_pPoints; }
 
   CFX_FloatRect GetBoundingBox() const { return m_pObject->GetBoundingBox(); }
 
   CFX_FloatRect GetBoundingBox(FX_FLOAT line_width,
                                FX_FLOAT miter_limit) const {
     return m_pObject->GetBoundingBox(line_width, miter_limit);
   }
 
-  void Transform(const CFX_AffineMatrix* pMatrix) {
-    GetModify()->Transform(pMatrix);
-  }
+  void Transform(const CFX_Matrix* pMatrix) { GetModify()->Transform(pMatrix); }
 
-  void Append(CPDF_Path src, const CFX_AffineMatrix* pMatrix) {
+  void Append(CPDF_Path src, const CFX_Matrix* pMatrix) {
     m_pObject->Append(src.m_pObject, pMatrix);
   }
 
   void AppendRect(FX_FLOAT left,
                   FX_FLOAT bottom,
                   FX_FLOAT right,
                   FX_FLOAT top) {
     m_pObject->AppendRect(left, bottom, right, top);
   }
 
@@ skipping 32 matching lines @@
   CPDF_TextObject* GetText(int i) const { return m_pObject->m_pTextList[i]; }
 
   CFX_FloatRect GetClipBox() const;
 
   void AppendPath(CPDF_Path path, int type, FX_BOOL bAutoMerge);
 
   void DeletePath(int layer_index);
 
   void AppendTexts(CPDF_TextObject** pTexts, int count);
 
-  void Transform(const CFX_AffineMatrix& matrix);
+  void Transform(const CFX_Matrix& matrix);
 };
 class CPDF_ColorStateData {
  public:
   CPDF_ColorStateData() : m_FillRGB(0), m_StrokeRGB(0) {}
 
   CPDF_ColorStateData(const CPDF_ColorStateData& src);
 
   void Default();
 
   CPDF_Color m_FillColor;
@@ skipping 232 matching lines @@
 
 class CPDF_PageObject : public CPDF_GraphicStates {
  public:
   static CPDF_PageObject* Create(int type);
   virtual ~CPDF_PageObject();
 
   CPDF_PageObject* Clone() const;
 
   void Copy(const CPDF_PageObject* pSrcObject);
 
-  virtual void Transform(const CFX_AffineMatrix& matrix) = 0;
+  virtual void Transform(const CFX_Matrix& matrix) = 0;
 
   void RemoveClipPath();
 
   void AppendClipPath(CPDF_Path path, int type, FX_BOOL bAutoMerge);
 
   void CopyClipPath(CPDF_PageObject* pObj);
 
-  void TransformClipPath(CFX_AffineMatrix& matrix);
+  void TransformClipPath(CFX_Matrix& matrix);
 
-  void TransformGeneralState(CFX_AffineMatrix& matrix);
+  void TransformGeneralState(CFX_Matrix& matrix);
 
   void SetColorState(CPDF_ColorState state) { m_ColorState = state; }
 
-  FX_RECT GetBBox(const CFX_AffineMatrix* pMatrix) const;
+  FX_RECT GetBBox(const CFX_Matrix* pMatrix) const;
 
   int m_Type;
 
   FX_FLOAT m_Left;
 
   FX_FLOAT m_Right;
 
   FX_FLOAT m_Top;
 
   FX_FLOAT m_Bottom;
@@ skipping 30 matching lines @@
 
   void GetCharRect(int index, CFX_FloatRect& rect) const;
 
   FX_FLOAT GetCharWidth(FX_DWORD charcode) const;
   FX_FLOAT GetSpaceCharWidth() const;
 
   FX_FLOAT GetPosX() const { return m_PosX; }
 
   FX_FLOAT GetPosY() const { return m_PosY; }
 
-  void GetTextMatrix(CFX_AffineMatrix* pMatrix) const;
+  void GetTextMatrix(CFX_Matrix* pMatrix) const;
 
   CPDF_Font* GetFont() const { return m_TextState.GetFont(); }
 
   FX_FLOAT GetFontSize() const { return m_TextState.GetFontSize(); }
 
   void SetEmpty();
 
   void SetText(const CFX_ByteString& text);
 
   void SetText(CFX_ByteString* pStrs, FX_FLOAT* pKerning, int nSegs);
 
   void SetText(int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pKernings);
 
   void SetPosition(FX_FLOAT x, FX_FLOAT y);
 
   void SetTextState(CPDF_TextState TextState);
 
   // CPDF_PageObject:
-  void Transform(const CFX_AffineMatrix& matrix) override;
+  void Transform(const CFX_Matrix& matrix) override;
 
   void CalcCharPos(FX_FLOAT* pPosArray) const;
 
   void SetData(int nChars,
                FX_DWORD* pCharCodes,
                FX_FLOAT* pCharPos,
                FX_FLOAT x,
                FX_FLOAT y);
 
   void GetData(int& nChars, FX_DWORD*& pCharCodes, FX_FLOAT*& pCharPos) {
@@ skipping 28 matching lines @@
   FX_DWORD* m_pCharCodes;
 
   FX_FLOAT* m_pCharPos;
 };
 
 class CPDF_PathObject : public CPDF_PageObject {
  public:
   CPDF_PathObject() { m_Type = PDFPAGE_PATH; }
   ~CPDF_PathObject() override {}
 
-  void Transform(const CFX_AffineMatrix& maxtrix) override;
+  void Transform(const CFX_Matrix& maxtrix) override;
 
   void SetGraphState(CPDF_GraphState GraphState);
 
   void CalcBoundingBox();
 
   CPDF_Path m_Path;
 
   int m_FillType;
 
   FX_BOOL m_bStroke;
 
-  CFX_AffineMatrix m_Matrix;
+  CFX_Matrix m_Matrix;
 
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_ImageObject : public CPDF_PageObject {
  public:
   CPDF_ImageObject();
   ~CPDF_ImageObject() override;
 
-  void Transform(const CFX_AffineMatrix& matrix) override;
+  void Transform(const CFX_Matrix& matrix) override;
 
   CPDF_Image* m_pImage;
 
-  CFX_AffineMatrix m_Matrix;
+  CFX_Matrix m_Matrix;
 
   void CalcBoundingBox();
 
  private:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_ShadingObject : public CPDF_PageObject {
  public:
   CPDF_ShadingObject();
   ~CPDF_ShadingObject() override;
 
   CPDF_ShadingPattern* m_pShading;
 
-  CFX_AffineMatrix m_Matrix;
+  CFX_Matrix m_Matrix;
 
-  void Transform(const CFX_AffineMatrix& matrix) override;
+  void Transform(const CFX_Matrix& matrix) override;
 
   void CalcBoundingBox();
 
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 class CPDF_FormObject : public CPDF_PageObject {
  public:
   CPDF_FormObject() {
     m_Type = PDFPAGE_FORM;
     m_pForm = NULL;
   }
   ~CPDF_FormObject() override;
 
-  void Transform(const CFX_AffineMatrix& matrix) override;
+  void Transform(const CFX_Matrix& matrix) override;
 
   CPDF_Form* m_pForm;
 
-  CFX_AffineMatrix m_FormMatrix;
+  CFX_Matrix m_FormMatrix;
 
   void CalcBoundingBox();
 
  protected:
   void CopyData(const CPDF_PageObject* pSrcObject) override;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_