Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/fpdf_transformpage.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/fpdf_transformpage.h"
 
 #include "fpdfsdk/include/fsdk_define.h"
 
@@ skipping 157 matching lines @@
         if (pObj->IsReference())
           pObj = pObj->GetDirect();
 
         if (pObj->IsDictionary())
           pDict = pObj->AsDictionary();
         else if (CPDF_Stream* pStream = pObj->AsStream())
           pDict = pStream->GetDict();
         else
           continue;
 
-        CFX_AffineMatrix m = pDict->GetMatrix(FX_BSTRC("Matrix"));
-        CFX_AffineMatrix t = *(CFX_AffineMatrix*)matrix;
+        CFX_Matrix m = pDict->GetMatrix(FX_BSTRC("Matrix"));
+        CFX_Matrix t = *(CFX_Matrix*)matrix;
         m.Concat(t);
         pDict->SetAtMatrix(FX_BSTRC("Matrix"), m);
       }
     }
   }
 
   return TRUE;
 }
 
 DLLEXPORT void STDCALL
 FPDFPageObj_TransformClipPath(FPDF_PAGEOBJECT page_object,
                               double a,
                               double b,
                               double c,
                               double d,
                               double e,
                               double f) {
   CPDF_PageObject* pPageObj = (CPDF_PageObject*)page_object;
   if (pPageObj == NULL)
     return;
-  CFX_AffineMatrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
-                          (FX_FLOAT)e, (FX_FLOAT)f);
+  CFX_Matrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d,
+                    (FX_FLOAT)e, (FX_FLOAT)f);
 
   // Special treatment to shading object, because the ClipPath for shading
   // object is already transformed.
   if (pPageObj->m_Type != PDFPAGE_SHADING)
     pPageObj->TransformClipPath(matrix);
   pPageObj->TransformGeneralState(matrix);
 }
 
 DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left,
                                                     float bottom,
@@ skipping 104 matching lines @@
       } else if (pDirectObj->IsStream()) {
         pContentArray = new CPDF_Array();
         pContentArray->AddReference(pDoc, pStream->GetObjNum());
         pContentArray->AddReference(pDoc, pDirectObj->GetObjNum());
         pPageDic->SetAtReference("Contents", pDoc,
                                  pDoc->AddIndirectObject(pContentArray));
       }
     }
   }
 }