Remove typdefs for pointer types in fx_system.h

core/src/fpdfapi/fpdf_font/fpdf_font_cid.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 "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "font_int.h"
 #include "../fpdf_cmaps/cmap_int.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
 extern FX_DWORD FT_CharCodeFromUnicode(int encoding, FX_WCHAR unicode);
 extern short TT2PDF(int m, FXFT_Face face);
 extern FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id);
-extern FX_LPCSTR GetAdobeCharName(int iBaseEncoding, const CFX_ByteString* pCharNames, int charcode);
+extern const FX_CHAR* GetAdobeCharName(int iBaseEncoding, const CFX_ByteString* pCharNames, int charcode);
 CPDF_CMapManager::CPDF_CMapManager()
 {
     m_bPrompted = FALSE;
     FXSYS_memset32(m_CID2UnicodeMaps, 0, sizeof m_CID2UnicodeMaps);
 }
 CPDF_CMapManager::~CPDF_CMapManager()
 {
     DropAll(FALSE);
 }
 CPDF_CMap* CPDF_CMapManager::GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK)
 {
     CPDF_CMap* pCMap;
-    if (m_CMaps.Lookup(name, (FX_LPVOID&)pCMap)) {
+    if (m_CMaps.Lookup(name, (void*&)pCMap)) {
         return pCMap;
     }
     pCMap = LoadPredefinedCMap(name, bPromptCJK);
     if (name.IsEmpty()) {
         return pCMap;
     }
     m_CMaps.SetAt(name, pCMap);
     return pCMap;
 }
 CPDF_CMap* CPDF_CMapManager::LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK)
 {
     CPDF_CMap* pCMap = new CPDF_CMap;
-    FX_LPCSTR pname = name;
+    const FX_CHAR* pname = name;
     if (*pname == '/') {
         pname ++;
     }
     pCMap->LoadPredefined(this, pname, bPromptCJK);
     return pCMap;
 }
-static const FX_LPCSTR g_CharsetNames[NUMBER_OF_CIDSETS] = {NULL, "GB1", "CNS1", "Japan1", "Korea1", "UCS" };
+static const FX_CHAR* const g_CharsetNames[NUMBER_OF_CIDSETS] = {NULL, "GB1", "CNS1", "Japan1", "Korea1", "UCS" };
 static const int g_CharsetCPs[NUMBER_OF_CIDSETS] = {0, 936, 950, 932, 949, 1200 };
 int _CharsetFromOrdering(const CFX_ByteString& Ordering)
 {
         for (int charset = 1; charset < NUMBER_OF_CIDSETS; charset++) {
                 if (Ordering == CFX_ByteStringC(g_CharsetNames[charset]))
                         return charset;
         }
         return CIDSET_UNKNOWN;
 }
 void CPDF_CMapManager::ReloadAll()
 {
     DropAll(TRUE);
 }
 void CPDF_CMapManager::DropAll(FX_BOOL bReload)
 {
     FX_POSITION pos = m_CMaps.GetStartPosition();
     while (pos) {
         CFX_ByteString name;
         CPDF_CMap* pCMap;
-        m_CMaps.GetNextAssoc(pos, name, (FX_LPVOID&)pCMap);
+        m_CMaps.GetNextAssoc(pos, name, (void*&)pCMap);
         if (pCMap == NULL) {
             continue;
         }
         if (bReload) {
             pCMap->LoadPredefined(this, name, FALSE);
         } else {
             delete pCMap;
         }
     }
     for (int i = 0; i < sizeof m_CID2UnicodeMaps / sizeof(CPDF_CID2UnicodeMap*); i ++) {
@@ skipping 260 matching lines @@
     { "KSC-EUC", CIDSET_KOREA1, CIDCODING_KOREA, CPDF_CMap::MixedTwoBytes, 1, {0xa1, 0xfe} },
     { "KSCms-UHC", CIDSET_KOREA1, CIDCODING_KOREA, CPDF_CMap::MixedTwoBytes, 1, {0x81, 0xfe} },
     { "KSCms-UHC-HW", CIDSET_KOREA1, CIDCODING_KOREA, CPDF_CMap::MixedTwoBytes, 1, {0x81, 0xfe} },
     { "KSCpc-EUC", CIDSET_KOREA1, CIDCODING_KOREA, CPDF_CMap::MixedTwoBytes, 1, {0xa1, 0xfd} },
     { "UniKS-UCS2", CIDSET_KOREA1, CIDCODING_UCS2, CPDF_CMap::TwoBytes },
     { "UniKS-UTF16", CIDSET_KOREA1, CIDCODING_UTF16, CPDF_CMap::TwoBytes },
     { NULL, 0, 0 }
 };
 extern void FPDFAPI_FindEmbeddedCMap(const char* name, int charset, int coding, const FXCMAP_CMap*& pMap);
 extern FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode);
-FX_BOOL CPDF_CMap::LoadPredefined(CPDF_CMapManager* pMgr, FX_LPCSTR pName, FX_BOOL bPromptCJK)
+FX_BOOL CPDF_CMap::LoadPredefined(CPDF_CMapManager* pMgr, const FX_CHAR* pName, FX_BOOL bPromptCJK)
 {
     m_PredefinedCMap = pName;
     if (m_PredefinedCMap == FX_BSTRC("Identity-H") || m_PredefinedCMap == FX_BSTRC("Identity-V")) {
         m_Coding = CIDCODING_CID;
         m_bVertical = pName[9] == 'V';
         m_bLoaded = TRUE;
         return TRUE;
     }
     CFX_ByteString cmapid = m_PredefinedCMap;
     m_bVertical = cmapid.Right(1) == FX_BSTRC("V");
@@ skipping 28 matching lines @@
         return TRUE;
     }
     return FALSE;
 }
 extern "C" {
     static int compare_dword(const void* data1, const void* data2)
     {
         return (*(FX_DWORD*)data1) - (*(FX_DWORD*)data2);
     }
 };
-FX_BOOL CPDF_CMap::LoadEmbedded(FX_LPCBYTE pData, FX_DWORD size)
+FX_BOOL CPDF_CMap::LoadEmbedded(const uint8_t* pData, FX_DWORD size)
 {
     m_pMapping = FX_Alloc(FX_WORD, 65536);
     CPDF_CMapParser parser;
     parser.Initialize(this);
     CPDF_SimpleParser syntax(pData, size);
     while (1) {
         CFX_ByteStringC word = syntax.GetWord();
         if (word.IsEmpty()) {
             break;
         }
@@ skipping 45 matching lines @@
             return m_pUseMap->CIDFromCharCode(charcode);
         }
         return 0;
     }
     FX_DWORD CID = m_pMapping[charcode];
     if (!CID && m_pUseMap) {
         return m_pUseMap->CIDFromCharCode(charcode);
     }
     return (FX_WORD)CID;
 }
-static int _CheckCodeRange(FX_LPBYTE codes, int size, _CMap_CodeRange* pRanges, int nRanges)
+static int _CheckCodeRange(uint8_t* codes, int size, _CMap_CodeRange* pRanges, int nRanges)
 {
     int iSeg = nRanges - 1;
     while (iSeg >= 0) {
         if (pRanges[iSeg].m_CharSize < size) {
             iSeg --;
             continue;
         }
         int iChar = 0;
         while (iChar < size) {
             if (codes[iChar] < pRanges[iSeg].m_Lower[iChar] ||
                     codes[iChar] > pRanges[iSeg].m_Upper[iChar]) {
                 break;
             }
             iChar ++;
         }
         if (iChar == pRanges[iSeg].m_CharSize) {
             return 2;
         }
         if (iChar) {
             if (size == pRanges[iSeg].m_CharSize) {
                 return 2;
             }
             return 1;
         }
         iSeg --;
     }
     return 0;
 }
-FX_DWORD CPDF_CMap::GetNextChar(FX_LPCSTR pString, int nStrLen, int& offset) const
+FX_DWORD CPDF_CMap::GetNextChar(const FX_CHAR* pString, int nStrLen, int& offset) const
 {
     switch (m_CodingScheme) {
         case OneByte:
-            return ((FX_LPBYTE)pString)[offset++];
+            return ((uint8_t*)pString)[offset++];
         case TwoBytes:
             offset += 2;
-            return ((FX_LPBYTE)pString)[offset - 2] * 256 + ((FX_LPBYTE)pString)[offset - 1];
+            return ((uint8_t*)pString)[offset - 2] * 256 + ((uint8_t*)pString)[offset - 1];
         case MixedTwoBytes: {
-                uint8_t byte1 = ((FX_LPBYTE)pString)[offset++];
+                uint8_t byte1 = ((uint8_t*)pString)[offset++];
                 if (!m_pLeadingBytes[byte1]) {
                     return byte1;
                 }
-                uint8_t byte2 = ((FX_LPBYTE)pString)[offset++];
+                uint8_t byte2 = ((uint8_t*)pString)[offset++];
                 return byte1 * 256 + byte2;
             }
         case MixedFourBytes: {
                 uint8_t codes[4];
                 int char_size = 1;
-                codes[0] = ((FX_LPBYTE)pString)[offset++];
+                codes[0] = ((uint8_t*)pString)[offset++];
                 _CMap_CodeRange* pRanges = (_CMap_CodeRange*)m_pLeadingBytes;
                 while (1) {
                     int ret = _CheckCodeRange(codes, char_size, pRanges, m_nCodeRanges);
                     if (ret == 0) {
                         return 0;
                     }
                     if (ret == 2) {
                         FX_DWORD charcode = 0;
                         for (int i = 0; i < char_size; i ++) {
                             charcode = (charcode << 8) + codes[i];
                         }
                         return charcode;
                     }
                     if (char_size == 4 || offset == nStrLen) {
                         return 0;
                     }
-                    codes[char_size ++] = ((FX_LPBYTE)pString)[offset++];
+                    codes[char_size ++] = ((uint8_t*)pString)[offset++];
                 }
                 break;
             }
     }
     return 0;
 }
 int CPDF_CMap::GetCharSize(FX_DWORD charcode) const
 {
     switch (m_CodingScheme) {
         case OneByte:
             return 1;
         case TwoBytes:
             return 2;
         case MixedTwoBytes:
         case MixedFourBytes:
             if (charcode < 0x100) {
                 return 1;
             }
             if (charcode < 0x10000) {
                 return 2;
             }
             if (charcode < 0x1000000) {
                 return 3;
             }
             return 4;
     }
     return 1;
 }
-int CPDF_CMap::CountChar(FX_LPCSTR pString, int size) const
+int CPDF_CMap::CountChar(const FX_CHAR* pString, int size) const
 {
     switch (m_CodingScheme) {
         case OneByte:
             return size;
         case TwoBytes:
             return (size + 1) / 2;
         case MixedTwoBytes: {
                 int count = 0;
                 for (int i = 0; i < size; i ++) {
                     count ++;
-                    if (m_pLeadingBytes[((FX_LPBYTE)pString)[i]]) {
+                    if (m_pLeadingBytes[((uint8_t*)pString)[i]]) {
                         i ++;
                     }
                 }
                 return count;
             }
         case MixedFourBytes: {
                 int count = 0, offset = 0;
                 while (offset < size) {
                     GetNextChar(pString, size, offset);
                     count ++;
@@ skipping 31 matching lines @@
             if (iChar == pRanges[iSeg].m_CharSize) {
                 return size;
             }
             iSeg --;
         }
         size --;
         offset ++;
     }
     return 1;
 }
-int CPDF_CMap::AppendChar(FX_LPSTR str, FX_DWORD charcode) const
+int CPDF_CMap::AppendChar(FX_CHAR* str, FX_DWORD charcode) const
 {
     switch (m_CodingScheme) {
         case OneByte:
             str[0] = (uint8_t)charcode;
             return 1;
         case TwoBytes:
             str[0] = (uint8_t)(charcode / 256);
             str[1] = (uint8_t)(charcode % 256);
             return 2;
         case MixedTwoBytes:
@@ skipping 153 matching lines @@
             return m_pCID2UnicodeMap->UnicodeFromCID((FX_WORD)charcode);
     }
     if (!m_pCMap->IsLoaded() || m_pCID2UnicodeMap == NULL || !m_pCID2UnicodeMap->IsLoaded()) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
         FX_WCHAR unicode;
         int charsize = 1;
         if (charcode > 255) {
             charcode = (charcode % 256) * 256 + (charcode / 256);
             charsize = 2;
         }
-        int ret = FXSYS_MultiByteToWideChar(g_CharsetCPs[m_pCMap->m_Coding], 0, (FX_LPCSTR)&charcode, charsize, &unicode, 1);
+        int ret = FXSYS_MultiByteToWideChar(g_CharsetCPs[m_pCMap->m_Coding], 0, (const FX_CHAR*)&charcode, charsize, &unicode, 1);
         if (ret != 1) {
             return 0;
         }
         return unicode;
 #endif
         if (m_pCMap->m_pEmbedMap) {
             return _EmbeddedUnicodeFromCharcode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, charcode);
         } else {
             return 0;
         }
@@ skipping 242 matching lines @@
                 rect.left = TT2PDF(FXFT_Get_Glyph_HoriBearingX(face), face);
                 rect.right = TT2PDF(FXFT_Get_Glyph_HoriBearingX(face) + FXFT_Get_Glyph_Width(face), face);
                 rect.top = TT2PDF(FXFT_Get_Glyph_HoriBearingY(face), face);
                 rect.top += rect.top / 64;
                 rect.bottom = TT2PDF(FXFT_Get_Glyph_HoriBearingY(face) - FXFT_Get_Glyph_Height(face), face);
             }
         }
     }
     if (m_pFontFile == NULL && m_Charset == CIDSET_JAPAN1) {
         FX_WORD CID = CIDFromCharCode(charcode);
-        FX_LPCBYTE pTransform = GetCIDTransform(CID);
+        const uint8_t* pTransform = GetCIDTransform(CID);
         if (pTransform && !bVert) {
             CFX_AffineMatrix matrix(_CIDTransformToFloat(pTransform[0]), _CIDTransformToFloat(pTransform[1]),
                                     _CIDTransformToFloat(pTransform[2]), _CIDTransformToFloat(pTransform[3]),
                                     _CIDTransformToFloat(pTransform[4]) * 1000 , _CIDTransformToFloat(pTransform[5]) * 1000);
             CFX_FloatRect rect_f(rect);
             rect_f.Transform(&matrix);
             rect = rect_f.GetOutterRect();
         }
     }
     if (charcode < 256) {
@@ skipping 145 matching lines @@
             FX_BOOL bMacRoman = FALSE;
             if (!bMSUnicode) {
                 bMacRoman = FT_UseTTCharmap(m_Font.m_Face, 1, 0);
             }
             iBaseEncoding = PDFFONT_ENCODING_STANDARD;
             if (bMSUnicode) {
                 iBaseEncoding = PDFFONT_ENCODING_WINANSI;
             } else if (bMacRoman) {
                 iBaseEncoding = PDFFONT_ENCODING_MACROMAN;
             }
-            FX_LPCSTR name = GetAdobeCharName(iBaseEncoding, NULL, charcode);
+            const FX_CHAR* name = GetAdobeCharName(iBaseEncoding, NULL, charcode);
             if (name == NULL) {
                 return charcode == 0 ? -1 : (int)charcode;
             }
             FX_WORD unicode = PDF_UnicodeFromAdobeName(name);
             if (unicode) {
                 if (bMSUnicode) {
                     index = FXFT_Get_Char_Index(m_Font.m_Face, unicode);
                 } else if (bMacRoman) {
                     FX_DWORD maccode = FT_CharCodeFromUnicode(FXFT_ENCODING_APPLE_ROMAN, unicode);
                     index = !maccode ? FXFT_Get_Name_Index(m_Font.m_Face, (char *)name) : FXFT_Get_Char_Index(m_Font.m_Face, maccode);
@@ skipping 71 matching lines @@
                 }
                 charcode = unicode_str.GetAt(0);
             }
             return GetGlyphIndex(charcode, pVertGlyph);
         }
     }
     FX_DWORD byte_pos = cid * 2;
     if (byte_pos + 2 > m_pCIDToGIDMap->GetSize()) {
         return -1;
     }
-    FX_LPCBYTE pdata = m_pCIDToGIDMap->GetData() + byte_pos;
+    const uint8_t* pdata = m_pCIDToGIDMap->GetData() + byte_pos;
     return pdata[0] * 256 + pdata[1];
 }
-FX_DWORD CPDF_CIDFont::GetNextChar(FX_LPCSTR pString, int nStrLen, int& offset) const
+FX_DWORD CPDF_CIDFont::GetNextChar(const FX_CHAR* pString, int nStrLen, int& offset) const
 {
     return m_pCMap->GetNextChar(pString, nStrLen, offset);
 }
 int CPDF_CIDFont::GetCharSize(FX_DWORD charcode) const
 {
     return m_pCMap->GetCharSize(charcode);
 }
-int CPDF_CIDFont::CountChar(FX_LPCSTR pString, int size) const
+int CPDF_CIDFont::CountChar(const FX_CHAR* pString, int size) const
 {
     return m_pCMap->CountChar(pString, size);
 }
-int CPDF_CIDFont::AppendChar(FX_LPSTR str, FX_DWORD charcode) const
+int CPDF_CIDFont::AppendChar(FX_CHAR* str, FX_DWORD charcode) const
 {
     return m_pCMap->AppendChar(str, charcode);
 }
 FX_BOOL CPDF_CIDFont::IsUnicodeCompatible() const
 {
     if (!m_pCMap->IsLoaded() || m_pCID2UnicodeMap == NULL || !m_pCID2UnicodeMap->IsLoaded()) {
         return m_pCMap->m_Coding != CIDCODING_UNKNOWN;
     }
     return TRUE;
 }
@@ skipping 229 matching lines @@
     {8811, 0, 129, 127, 0, 19, 114},
     {8812, 0, 129, 127, 0, 19, 102},
     {8813, 0, 129, 127, 0, 19, 114},
     {8814, 0, 129, 127, 0, 76, 102},
     {8815, 0, 129, 127, 0, 13, 121},
     {8816, 0, 129, 127, 0, 19, 114},
     {8817, 0, 129, 127, 0, 19, 127},
     {8818, 0, 129, 127, 0, 19, 114},
     {8819, 0, 129, 127, 0, 218, 108},
 };
-FX_LPCBYTE CPDF_CIDFont::GetCIDTransform(FX_WORD CID) const
+const uint8_t* CPDF_CIDFont::GetCIDTransform(FX_WORD CID) const
 {
     if (m_Charset != CIDSET_JAPAN1 || m_pFontFile != NULL) {
         return NULL;
     }
     int begin = 0;
     int end = sizeof Japan1_VertCIDs / sizeof(struct _CIDTransform) - 1;
     while (begin <= end) {
         int middle = (begin + end) / 2;
         FX_WORD middlecode = Japan1_VertCIDs[middle].CID;
         if (middlecode > CID) {
             end = middle - 1;
         } else if (middlecode < CID) {
             begin = middle + 1;
         } else {
             return &Japan1_VertCIDs[middle].a;
         }
     }
     return NULL;
 }