Remove typdefs for pointer types in fx_system.h

core/include/fxge/fx_font.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_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include "../fxcrt/fx_ext.h"
@@ skipping 39 matching lines @@
 #define FXFONT_FW_BOLD                  700
 class CFX_Font 
 {
 public:
     CFX_Font();
     ~CFX_Font();
 
     FX_BOOL                                     LoadSubst(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
                                       int weight, int italic_angle, int CharsetCP, FX_BOOL bVertical = FALSE);
 
-    FX_BOOL                                     LoadEmbedded(FX_LPCBYTE data, FX_DWORD size);
+    FX_BOOL                                     LoadEmbedded(const uint8_t* data, FX_DWORD size);
 
     FX_BOOL                                     LoadFile(IFX_FileRead* pFile);
 
     FXFT_Face                           GetFace() const
     {
         return m_Face;
     }
 
 
     const CFX_SubstFont*        GetSubstFont() const
@@ skipping 44 matching lines @@
 
     FXFT_Face                           m_Face;
 
     CFX_SubstFont*                      m_pSubstFont;
     FX_BOOL                                     IsEmbedded()
     {
         return m_bEmbedded;
     }
 
     void                                        AdjustMMParams(int glyph_index, int width, int weight);
-    FX_LPBYTE                           m_pFontDataAllocation;
-    FX_LPBYTE               m_pFontData;
-    FX_LPBYTE                           m_pGsubData;
+    uint8_t*                            m_pFontDataAllocation;
+    uint8_t*               m_pFontData;
+    uint8_t*                            m_pGsubData;
     FX_DWORD                m_dwSize;
     CFX_BinaryBuf           m_OtfFontData;
     void*                   m_hHandle;
     void*                   m_pPlatformFont;
     void*                   m_pPlatformFontCollection;
     void*                   m_pDwFont;
     FX_BOOL                 m_bDwLoaded;
     void                    ReleasePlatformResource();
 
     void                                        DeleteFace();
@@ skipping 23 matching lines @@
 #define FXFONT_SUBST_TRANSFORM          0x10
 #define FXFONT_SUBST_NONSYMBOL          0x20
 #define FXFONT_SUBST_EXACT                      0x40
 #define FXFONT_SUBST_STANDARD           0x80
 class CFX_SubstFont 
 {
 public:
 
     CFX_SubstFont();
 
-    FX_LPVOID                           m_ExtHandle;
+    void*                               m_ExtHandle;
 
     CFX_ByteString                      m_Family;
 
     int                                         m_Charset;
 
     FX_DWORD                            m_SubstFlags;
 
     int                                         m_Weight;
 
     int                                         m_ItalicAngle;
 
     FX_BOOL                                     m_bSubstOfCJK;
 
     int                                         m_WeightCJK;
 
     FX_BOOL                                     m_bItlicCJK;
 };
 #define FX_FONT_FLAG_SERIF              0x01
 #define FX_FONT_FLAG_FIXEDPITCH                 0x02
 #define FX_FONT_FLAG_ITALIC                             0x04
 #define FX_FONT_FLAG_BOLD                               0x08
 #define FX_FONT_FLAG_SYMBOLIC_SYMBOL    0x10
 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS  0x20
 #define FX_FONT_FLAG_MULTIPLEMASTER             0x40
 typedef struct {
-    FX_LPCBYTE  m_pFontData;
+    const uint8_t*      m_pFontData;
     FX_DWORD    m_dwSize;
 } FoxitFonts;
 class CFX_FontMgr 
 {
 public:
     CFX_FontMgr();
     ~CFX_FontMgr();
     void                        InitFTLibrary();
     FXFT_Face           GetCachedFace(const CFX_ByteString& face_name,
-                                  int weight, FX_BOOL bItalic, FX_LPBYTE& pFontData);
+                                  int weight, FX_BOOL bItalic, uint8_t*& pFontData);
     FXFT_Face           AddCachedFace(const CFX_ByteString& face_name,
-                                  int weight, FX_BOOL bItalic, FX_LPBYTE pData, FX_DWORD size, int face_index);
+                                  int weight, FX_BOOL bItalic, uint8_t* pData, FX_DWORD size, int face_index);
     FXFT_Face           GetCachedTTCFace(int ttc_size, FX_DWORD checksum,
-                                     int font_offset, FX_LPBYTE& pFontData);
+                                     int font_offset, uint8_t*& pFontData);
     FXFT_Face           AddCachedTTCFace(int ttc_size, FX_DWORD checksum,
-                                     FX_LPBYTE pData, FX_DWORD size, int font_offset);
-    FXFT_Face           GetFileFace(FX_LPCSTR filename, int face_index);
-    FXFT_Face           GetFixedFace(FX_LPCBYTE pData, FX_DWORD size, int face_index);
+                                     uint8_t* pData, FX_DWORD size, int font_offset);
+    FXFT_Face           GetFileFace(const FX_CHAR* filename, int face_index);
+    FXFT_Face           GetFixedFace(const uint8_t* pData, FX_DWORD size, int face_index);
     void                        ReleaseFace(FXFT_Face face);
     void                        SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
     FXFT_Face           FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags,
                                   int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont);
 
     void                        FreeCache();
 
-    FX_BOOL                     GetStandardFont(FX_LPCBYTE& pFontData, FX_DWORD& size, int index);
+    FX_BOOL                     GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index);
     CFX_FontMapper*     m_pBuiltinMapper;
     IFX_FontMapper*     m_pExtMapper;
     CFX_MapByteStringToPtr      m_FaceMap;
     FXFT_Library        m_FTLibrary;
     FoxitFonts m_ExternalFonts[16];
 };
 class IFX_FontMapper 
 {
 public:
 
@@ skipping 57 matching lines @@
     FXFT_Face                   m_FoxitFaces[14];
     IFX_FontEnumerator*         m_pFontEnumerator;
 };
 class IFX_SystemFontInfo 
 {
 public:
     static IFX_SystemFontInfo*  CreateDefault();
     virtual void                Release() = 0;
 
     virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper) = 0;
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact) = 0;
-    virtual void*               GetFont(FX_LPCSTR face) = 0;
-    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size) = 0;
+    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact) = 0;
+    virtual void*               GetFont(const FX_CHAR* face) = 0;
+    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size) = 0;
     virtual FX_BOOL             GetFaceName(void* hFont, CFX_ByteString& name) = 0;
     virtual FX_BOOL             GetFontCharset(void* hFont, int& charset) = 0;
     virtual int                 GetFaceIndex(void* hFont)
     {
         return 0;
     }
     virtual void                DeleteFont(void* hFont) = 0;
     virtual void*       RetainFont(void* hFont)
     {
         return NULL;
     }
 protected:
     ~IFX_SystemFontInfo() { }
 };
 class CFX_FolderFontInfo : public IFX_SystemFontInfo
 {
 public:
     CFX_FolderFontInfo();
     virtual ~CFX_FolderFontInfo();
     void                                AddPath(FX_BSTR path);
     virtual void                Release();
     virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper);
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact);
-    virtual void*               GetFont(FX_LPCSTR face);
-    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size);
+    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact);
+    virtual void*               GetFont(const FX_CHAR* face);
+    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size);
     virtual void                DeleteFont(void* hFont);
     virtual     FX_BOOL         GetFaceName(void* hFont, CFX_ByteString& name);
     virtual FX_BOOL             GetFontCharset(void* hFont, int& charset);
 protected:
     CFX_MapByteStringToPtr      m_FontList;
     CFX_ByteStringArray m_PathList;
     CFX_FontMapper*             m_pMapper;
     void                                ScanPath(CFX_ByteString& path);
     void                                ScanFile(CFX_ByteString& path);
     void                                ReportFace(CFX_ByteString& path, FXSYS_FILE* pFile, FX_DWORD filesize, FX_DWORD offset);
@@ skipping 87 matching lines @@
 public:
     virtual void        Release() = 0;
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 
 protected:
      ~IFX_GSUBTable() { }
 };
 IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont);
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_