Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fxge/fx_ge.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_GE_H_
 #define CORE_INCLUDE_FXGE_FX_GE_H_
 
 #include "fx_dib.h"
@@ skipping 118 matching lines @@
   FX_PATHPOINT* GetPoints() const { return m_pPoints; }
 
   void SetPointCount(int nPoints);
   void AllocPointCount(int nPoints);
   void AddPointCount(int addPoints);
 
   CFX_FloatRect GetBoundingBox() const;
 
   CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const;
 
-  void Transform(const CFX_AffineMatrix* pMatrix);
+  void Transform(const CFX_Matrix* pMatrix);
 
   FX_BOOL IsRect() const;
 
   FX_BOOL GetZeroAreaPath(CFX_PathData& NewPath,
-                          CFX_AffineMatrix* pMatrix,
+                          CFX_Matrix* pMatrix,
                           FX_BOOL& bThin,
                           FX_BOOL bAdjust) const;
 
-  FX_BOOL IsRect(const CFX_AffineMatrix* pMatrix, CFX_FloatRect* rect) const;
+  FX_BOOL IsRect(const CFX_Matrix* pMatrix, CFX_FloatRect* rect) const;
 
-  void Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix);
+  void Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix);
   void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top);
 
   void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag);
 
   void TrimPoints(int nPoints);
 
   void Copy(const CFX_PathData& src);
 
  protected:
   friend class CPDF_Path;
@@ skipping 113 matching lines @@
   CFX_DIBitmap* GetBitmap() const { return m_pBitmap; }
   void SetBitmap(CFX_DIBitmap* pBitmap) { m_pBitmap = pBitmap; }
 
   FX_BOOL CreateCompatibleBitmap(CFX_DIBitmap* pDIB,
                                  int width,
                                  int height) const;
 
   const FX_RECT& GetClipBox() const { return m_ClipBox; }
 
   FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData,
-                           const CFX_AffineMatrix* pObject2Device,
+                           const CFX_Matrix* pObject2Device,
                            int fill_mode);
 
   FX_BOOL SetClip_Rect(const FX_RECT* pRect);
 
   FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData,
-                             const CFX_AffineMatrix* pObject2Device,
+                             const CFX_Matrix* pObject2Device,
                              const CFX_GraphStateData* pGraphState);
 
   FX_BOOL DrawPath(const CFX_PathData* pPathData,
-                   const CFX_AffineMatrix* pObject2Device,
+                   const CFX_Matrix* pObject2Device,
                    const CFX_GraphStateData* pGraphState,
                    FX_DWORD fill_color,
                    FX_DWORD stroke_color,
                    int fill_mode,
                    int alpha_flag = 0,
                    void* pIccTransform = NULL,
                    int blend_type = FXDIB_BLEND_NORMAL);
 
   FX_BOOL SetPixel(int x,
                    int y,
@@ skipping 52 matching lines @@
                          int dest_width,
                          int dest_height,
                          FX_DWORD color,
                          FX_DWORD flags = 0,
                          int alpha_flag = 0,
                          void* pIccTransform = NULL);
 
   FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
                       int bitmap_alpha,
                       FX_DWORD color,
-                      const CFX_AffineMatrix* pMatrix,
+                      const CFX_Matrix* pMatrix,
                       FX_DWORD flags,
                       void*& handle,
                       int alpha_flag = 0,
                       void* pIccTransform = NULL,
                       int blend_type = FXDIB_BLEND_NORMAL);
 
   FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause);
 
   void CancelDIBits(void* handle);
 
   FX_BOOL DrawNormalText(int nChars,
                          const FXTEXT_CHARPOS* pCharPos,
                          CFX_Font* pFont,
                          CFX_FontCache* pCache,
                          FX_FLOAT font_size,
-                         const CFX_AffineMatrix* pText2Device,
+                         const CFX_Matrix* pText2Device,
                          FX_DWORD fill_color,
                          FX_DWORD text_flags,
                          int alpha_flag = 0,
                          void* pIccTransform = NULL);
 
   FX_BOOL DrawTextPath(int nChars,
                        const FXTEXT_CHARPOS* pCharPos,
                        CFX_Font* pFont,
                        CFX_FontCache* pCache,
                        FX_FLOAT font_size,
-                       const CFX_AffineMatrix* pText2User,
-                       const CFX_AffineMatrix* pUser2Device,
+                       const CFX_Matrix* pText2User,
+                       const CFX_Matrix* pUser2Device,
                        const CFX_GraphStateData* pGraphState,
                        FX_DWORD fill_color,
                        FX_DWORD stroke_color,
                        CFX_PathData* pClippingPath,
                        int nFlag = 0,
                        int alpha_flag = 0,
                        void* pIccTransform = NULL,
                        int blend_type = FXDIB_BLEND_NORMAL);
   virtual void Begin() {}
   virtual void End() {}
@@ skipping 82 matching lines @@
 
   virtual FX_BOOL StartRendering() { return TRUE; }
 
   virtual void EndRendering() {}
 
   virtual void SaveState() = 0;
 
   virtual void RestoreState(FX_BOOL bKeepSaved = FALSE) = 0;
 
   virtual FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData,
-                                   const CFX_AffineMatrix* pObject2Device,
+                                   const CFX_Matrix* pObject2Device,
                                    int fill_mode) = 0;
 
   virtual FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData,
-                                     const CFX_AffineMatrix* pObject2Device,
+                                     const CFX_Matrix* pObject2Device,
                                      const CFX_GraphStateData* pGraphState) {
     return FALSE;
   }
 
   virtual FX_BOOL DrawPath(const CFX_PathData* pPathData,
-                           const CFX_AffineMatrix* pObject2Device,
+                           const CFX_Matrix* pObject2Device,
                            const CFX_GraphStateData* pGraphState,
                            FX_DWORD fill_color,
                            FX_DWORD stroke_color,
                            int fill_mode,
                            int alpha_flag = 0,
                            void* pIccTransform = NULL,
                            int blend_type = FXDIB_BLEND_NORMAL) = 0;
 
   virtual FX_BOOL SetPixel(int x,
                            int y,
@@ skipping 50 matching lines @@
                                 int dest_height,
                                 const FX_RECT* pClipRect,
                                 FX_DWORD flags,
                                 int alpha_flag = 0,
                                 void* pIccTransform = NULL,
                                 int blend_type = FXDIB_BLEND_NORMAL) = 0;
 
   virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
                               int bitmap_alpha,
                               FX_DWORD color,
-                              const CFX_AffineMatrix* pMatrix,
+                              const CFX_Matrix* pMatrix,
                               FX_DWORD flags,
                               void*& handle,
                               int alpha_flag = 0,
                               void* pIccTransform = NULL,
                               int blend_type = FXDIB_BLEND_NORMAL) = 0;
 
   virtual FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) {
     return FALSE;
   }
 
   virtual void CancelDIBits(void* handle) {}
 
   virtual FX_BOOL DrawDeviceText(int nChars,
                                  const FXTEXT_CHARPOS* pCharPos,
                                  CFX_Font* pFont,
                                  CFX_FontCache* pCache,
-                                 const CFX_AffineMatrix* pObject2Device,
+                                 const CFX_Matrix* pObject2Device,
                                  FX_FLOAT font_size,
                                  FX_DWORD color,
                                  int alpha_flag = 0,
                                  void* pIccTransform = NULL) {
     return FALSE;
   }
 
   virtual void* GetPlatformSurface() { return NULL; }
 
   virtual int GetDriverType() { return 0; }
@@ skipping 23 matching lines @@
             int height,
             FX_BOOL bCmykOutput);
   FX_BOOL StartRendering();
   void EndRendering();
 
   void SaveState();
 
   void RestoreState(FX_BOOL bKeepSaved = FALSE);
 
   void SetClip_PathFill(const CFX_PathData* pPathData,
-                        const CFX_AffineMatrix* pObject2Device,
+                        const CFX_Matrix* pObject2Device,
                         int fill_mode);
 
   void SetClip_PathStroke(const CFX_PathData* pPathData,
-                          const CFX_AffineMatrix* pObject2Device,
+                          const CFX_Matrix* pObject2Device,
                           const CFX_GraphStateData* pGraphState);
 
   FX_RECT GetClipBox() { return m_ClipBox; }
 
   FX_BOOL DrawPath(const CFX_PathData* pPathData,
-                   const CFX_AffineMatrix* pObject2Device,
+                   const CFX_Matrix* pObject2Device,
                    const CFX_GraphStateData* pGraphState,
                    FX_DWORD fill_color,
                    FX_DWORD stroke_color,
                    int fill_mode,
                    int alpha_flag = 0,
                    void* pIccTransform = NULL);
 
   FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
                     FX_DWORD color,
                     int dest_left,
                     int dest_top,
                     int alpha_flag = 0,
                     void* pIccTransform = NULL);
 
   FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
                         FX_DWORD color,
                         int dest_left,
                         int dest_top,
                         int dest_width,
                         int dest_height,
                         FX_DWORD flags,
                         int alpha_flag = 0,
                         void* pIccTransform = NULL);
 
   FX_BOOL DrawDIBits(const CFX_DIBSource* pBitmap,
                      FX_DWORD color,
-                     const CFX_AffineMatrix* pMatrix,
+                     const CFX_Matrix* pMatrix,
                      FX_DWORD flags,
                      int alpha_flag = 0,
                      void* pIccTransform = NULL);
 
   FX_BOOL DrawText(int nChars,
                    const FXTEXT_CHARPOS* pCharPos,
                    CFX_Font* pFont,
                    CFX_FontCache* pCache,
-                   const CFX_AffineMatrix* pObject2Device,
+                   const CFX_Matrix* pObject2Device,
                    FX_FLOAT font_size,
                    FX_DWORD color,
                    int alpha_flag = 0,
                    void* pIccTransform = NULL);
 
  private:
   IFX_PSOutput* m_pOutput;
 
   int m_PSLevel;
 
   CFX_GraphStateData m_CurGraphState;
 
   FX_BOOL m_bGraphStateSet;
 
   FX_BOOL m_bCmykOutput;
 
   FX_BOOL m_bColorSet;
 
   FX_DWORD m_LastColor;
 
   FX_RECT m_ClipBox;
 
   CFX_ArrayTemplate<CPSFont*> m_PSFontList;
 
   CFX_ArrayTemplate<FX_RECT> m_ClipBoxStack;
   FX_BOOL m_bInited;
 
   void OutputPath(const CFX_PathData* pPathData,
-                  const CFX_AffineMatrix* pObject2Device);
+                  const CFX_Matrix* pObject2Device);
 
   void SetGraphState(const CFX_GraphStateData* pGraphState);
 
   void SetColor(FX_DWORD color, int alpha_flag, void* pIccTransform);
 
   void FindPSFontGlyph(CFX_FaceCache* pFaceCache,
                        CFX_Font* pFont,
                        const FXTEXT_CHARPOS& charpos,
                        int& ps_fontnum,
                        int& ps_glyphindex);
 
   void WritePSBinary(const uint8_t* data, int len);
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_GE_H_