Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_resource.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_RESOURCE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
 
 #include <map>
@@ skipping 359 matching lines @@
   // Takes ownership of |pForm|.
   explicit CPDF_Type3Char(CPDF_Form* pForm);
   ~CPDF_Type3Char();
 
   FX_BOOL LoadBitmap(CPDF_RenderContext* pContext);
 
   CPDF_Form* m_pForm;
   CFX_DIBitmap* m_pBitmap;
   FX_BOOL m_bColored;
   int m_Width;
-  CFX_AffineMatrix m_ImageMatrix;
+  CFX_Matrix m_ImageMatrix;
   FX_RECT m_BBox;
 };
 
 class CPDF_Type3Font : public CPDF_SimpleFont {
  public:
   CPDF_Type3Font();
   ~CPDF_Type3Font() override;
 
   void SetPageResources(CPDF_Dictionary* pResources) {
     m_pPageResources = pResources;
   }
   CPDF_Type3Char* LoadChar(FX_DWORD charcode, int level = 0);
   int GetCharWidthF(FX_DWORD charcode, int level = 0) override;
   int GetCharTypeWidth(FX_DWORD charcode) override {
     return GetCharWidthF(charcode);
   }
   void GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0) override;
-  CFX_AffineMatrix& GetFontMatrix() { return m_FontMatrix; }
+  CFX_Matrix& GetFontMatrix() { return m_FontMatrix; }
   void CheckType3FontMetrics();
 
  protected:
-  CFX_AffineMatrix m_FontMatrix;
+  CFX_Matrix m_FontMatrix;
 
  private:
   FX_BOOL _Load() override;
   void LoadGlyphMap() override {}
 
   int m_CharWidthL[256];
   CPDF_Dictionary* m_pCharProcs;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pFontResources;
   std::map<FX_DWORD, CPDF_Type3Char*> m_CacheMap;
@@ skipping 227 matching lines @@
 #define PATTERN_SHADING 2
 class CPDF_Pattern {
  public:
   virtual ~CPDF_Pattern();
   void SetForceClear(FX_BOOL bForceClear) { m_bForceClear = bForceClear; }
 
   CPDF_Object* m_pPatternObj;
 
   int m_PatternType;
 
-  CFX_AffineMatrix m_Pattern2Form;
-  CFX_AffineMatrix m_ParentMatrix;
+  CFX_Matrix m_Pattern2Form;
+  CFX_Matrix m_ParentMatrix;
 
   CPDF_Document* m_pDocument;
 
  protected:
-  CPDF_Pattern(const CFX_AffineMatrix* pParentMatrix);
+  CPDF_Pattern(const CFX_Matrix* pParentMatrix);
   FX_BOOL m_bForceClear;
 };
 
 class CPDF_TilingPattern : public CPDF_Pattern {
  public:
   CPDF_TilingPattern(CPDF_Document* pDoc,
                      CPDF_Object* pPatternObj,
-                     const CFX_AffineMatrix* parentMatrix);
+                     const CFX_Matrix* parentMatrix);
 
   ~CPDF_TilingPattern() override;
 
   FX_BOOL Load();
 
   FX_BOOL m_bColored;
 
   CFX_FloatRect m_BBox;
 
   FX_FLOAT m_XStep;
@@ skipping 13 matching lines @@
   kCoonsPatchMeshShading = 6,
   kTensorProductPatchMeshShading = 7,
   kMaxShading = 8
 } ShadingType;
 
 class CPDF_ShadingPattern : public CPDF_Pattern {
  public:
   CPDF_ShadingPattern(CPDF_Document* pDoc,
                       CPDF_Object* pPatternObj,
                       FX_BOOL bShading,
-                      const CFX_AffineMatrix* parentMatrix);
+                      const CFX_Matrix* parentMatrix);
 
   ~CPDF_ShadingPattern() override;
 
   bool IsMeshShading() const {
     return m_ShadingType == kFreeFormGouraudTriangleMeshShading ||
            m_ShadingType == kLatticeFormGouraudTriangleMeshShading ||
            m_ShadingType == kCoonsPatchMeshShading ||
            m_ShadingType == kTensorProductPatchMeshShading;
   }
 
@@ skipping 30 matching lines @@
                CPDF_Function** pFuncs,
                int nFuncs,
                CPDF_ColorSpace* pCS);
 
   FX_DWORD GetFlag();
 
   void GetCoords(FX_FLOAT& x, FX_FLOAT& y);
 
   void GetColor(FX_FLOAT& r, FX_FLOAT& g, FX_FLOAT& b);
 
-  FX_DWORD GetVertex(CPDF_MeshVertex& vertex, CFX_AffineMatrix* pObject2Bitmap);
+  FX_DWORD GetVertex(CPDF_MeshVertex& vertex, CFX_Matrix* pObject2Bitmap);
 
   FX_BOOL GetVertexRow(CPDF_MeshVertex* vertex,
                        int count,
-                       CFX_AffineMatrix* pObject2Bitmap);
+                       CFX_Matrix* pObject2Bitmap);
   CPDF_Function** m_pFuncs;
   CPDF_ColorSpace* m_pCS;
   FX_DWORD m_nFuncs, m_nCoordBits, m_nCompBits, m_nFlagBits, m_nComps;
   FX_DWORD m_CoordMax, m_CompMax;
   FX_FLOAT m_xmin, m_xmax, m_ymin, m_ymax;
   FX_FLOAT m_ColorMin[8], m_ColorMax[8];
   CPDF_StreamAcc m_Stream;
   CFX_BitStream m_BitStream;
 };
 #define PDF_IMAGE_NO_COMPRESS 0x0000
@@ skipping 88 matching lines @@
 
   FX_BOOL m_bInterpolate;
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pOC;
   CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_