Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_parser.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_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include <map>
 
 #include "core/include/fxcrt/fx_system.h"
 #include "fpdf_objects.h"
 #include "third_party/base/nonstd_unique_ptr.h"
 
 class CFDF_Document;
 class CFDF_Parser;
-class CFX_AffineMatrix;
 class CFX_DIBSource;
 class CFX_FloatRect;
 class CFX_Font;
+class CFX_Matrix;
 class CFX_PrivateData;
 class CPDF_ColorSpace;
 class CPDF_CryptoHandler;
 class CPDF_DocPageData;
 class CPDF_DocRenderData;
 class CPDF_Document;
 class CPDF_Font;
 class CPDF_FontEncoding;
 class CPDF_HintTables;
 class CPDF_IccProfile;
@@ skipping 83 matching lines @@
   FX_BOOL IsFormStream(FX_DWORD objnum, FX_BOOL& bForm) const;
 
   // |pFontDict| must not be null.
   CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict);
 
   CPDF_ColorSpace* LoadColorSpace(CPDF_Object* pCSObj,
                                   CPDF_Dictionary* pResources = NULL);
 
   CPDF_Pattern* LoadPattern(CPDF_Object* pObj,
                             FX_BOOL bShading,
-                            const CFX_AffineMatrix* matrix = NULL);
+                            const CFX_Matrix* matrix = NULL);
 
   CPDF_Image* LoadImageF(CPDF_Object* pObj);
 
   CPDF_StreamAcc* LoadFontFile(CPDF_Stream* pStream);
 
   CPDF_IccProfile* LoadIccProfile(CPDF_Stream* pStream);
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
   CPDF_Font* AddWindowsFont(LOGFONTA* pLogFont,
@@ skipping 646 matching lines @@
     x = xx;
     y = yy;
   }
 
   FX_FLOAT x;
 
   FX_FLOAT y;
 };
 
 #define CPDF_Rect CFX_FloatRect
-#define CPDF_Matrix CFX_AffineMatrix
 CFX_ByteString PDF_NameDecode(const CFX_ByteStringC& orig);
 CFX_ByteString PDF_NameDecode(const CFX_ByteString& orig);
 CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig);
 CFX_ByteString PDF_EncodeString(const CFX_ByteString& src,
                                 FX_BOOL bHex = FALSE);
 CFX_WideString PDF_DecodeText(const uint8_t* pData,
                               FX_DWORD size,
                               CFX_CharMap* pCharMap = NULL);
 inline CFX_WideString PDF_DecodeText(const CFX_ByteString& bstr,
                                      CFX_CharMap* pCharMap = NULL) {
@@ skipping 205 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_