summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp')
-rw-r--r--core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
index d54620d701..73ac8e1f6a 100644
--- a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp
@@ -30,15 +30,15 @@ void FPDFAPI_FindEmbeddedCMap(const char* name,
}
extern "C" {
static int compareWord(const void* p1, const void* p2) {
- return (*(FX_WORD*)p1) - (*(FX_WORD*)p2);
+ return (*(uint16_t*)p1) - (*(uint16_t*)p2);
}
};
extern "C" {
static int compareWordRange(const void* key, const void* element) {
- if (*(FX_WORD*)key < *(FX_WORD*)element) {
+ if (*(uint16_t*)key < *(uint16_t*)element) {
return -1;
}
- if (*(FX_WORD*)key > ((FX_WORD*)element)[1]) {
+ if (*(uint16_t*)key > ((uint16_t*)element)[1]) {
return 1;
}
return 0;
@@ -47,15 +47,15 @@ static int compareWordRange(const void* key, const void* element) {
extern "C" {
static int compareDWordRange(const void* p1, const void* p2) {
FX_DWORD key = *(FX_DWORD*)p1;
- FX_WORD hiword = (FX_WORD)(key >> 16);
- FX_WORD* element = (FX_WORD*)p2;
+ uint16_t hiword = (uint16_t)(key >> 16);
+ uint16_t* element = (uint16_t*)p2;
if (hiword < element[0]) {
return -1;
}
if (hiword > element[0]) {
return 1;
}
- FX_WORD loword = (FX_WORD)key;
+ uint16_t loword = (uint16_t)key;
if (loword < element[1]) {
return -1;
}
@@ -68,7 +68,7 @@ static int compareDWordRange(const void* p1, const void* p2) {
extern "C" {
static int compareDWordSingle(const void* p1, const void* p2) {
FX_DWORD key = *(FX_DWORD*)p1;
- FX_DWORD value = ((*(FX_WORD*)p2) << 16) | ((FX_WORD*)p2)[1];
+ FX_DWORD value = ((*(uint16_t*)p2) << 16) | ((uint16_t*)p2)[1];
if (key < value) {
return -1;
}
@@ -78,20 +78,20 @@ static int compareDWordSingle(const void* p1, const void* p2) {
return 0;
}
};
-FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode) {
+uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode) {
if (charcode >> 16) {
while (1) {
if (pMap->m_DWordMapType == FXCMAP_CMap::Range) {
- FX_WORD* found =
- (FX_WORD*)FXSYS_bsearch(&charcode, pMap->m_pDWordMap,
- pMap->m_DWordCount, 8, compareDWordRange);
+ uint16_t* found =
+ (uint16_t*)FXSYS_bsearch(&charcode, pMap->m_pDWordMap,
+ pMap->m_DWordCount, 8, compareDWordRange);
if (found) {
- return found[3] + (FX_WORD)charcode - found[1];
+ return found[3] + (uint16_t)charcode - found[1];
}
} else if (pMap->m_DWordMapType == FXCMAP_CMap::Single) {
- FX_WORD* found =
- (FX_WORD*)FXSYS_bsearch(&charcode, pMap->m_pDWordMap,
- pMap->m_DWordCount, 6, compareDWordSingle);
+ uint16_t* found =
+ (uint16_t*)FXSYS_bsearch(&charcode, pMap->m_pDWordMap,
+ pMap->m_DWordCount, 6, compareDWordSingle);
if (found) {
return found[2];
}
@@ -103,19 +103,19 @@ FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode) {
}
return 0;
}
- FX_WORD code = (FX_WORD)charcode;
+ uint16_t code = (uint16_t)charcode;
while (1) {
if (!pMap->m_pWordMap) {
return 0;
}
if (pMap->m_WordMapType == FXCMAP_CMap::Single) {
- FX_WORD* found = (FX_WORD*)FXSYS_bsearch(
+ uint16_t* found = (uint16_t*)FXSYS_bsearch(
&code, pMap->m_pWordMap, pMap->m_WordCount, 4, compareWord);
if (found) {
return found[1];
}
} else if (pMap->m_WordMapType == FXCMAP_CMap::Range) {
- FX_WORD* found = (FX_WORD*)FXSYS_bsearch(
+ uint16_t* found = (uint16_t*)FXSYS_bsearch(
&code, pMap->m_pWordMap, pMap->m_WordCount, 6, compareWordRange);
if (found) {
return found[2] + code - found[0];
@@ -128,11 +128,11 @@ FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode) {
}
return 0;
}
-FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) {
+FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid) {
while (1) {
if (pMap->m_WordMapType == FXCMAP_CMap::Single) {
- const FX_WORD* pCur = pMap->m_pWordMap;
- const FX_WORD* pEnd = pMap->m_pWordMap + pMap->m_WordCount * 2;
+ const uint16_t* pCur = pMap->m_pWordMap;
+ const uint16_t* pEnd = pMap->m_pWordMap + pMap->m_WordCount * 2;
while (pCur < pEnd) {
if (pCur[1] == cid) {
return pCur[0];
@@ -140,8 +140,8 @@ FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) {
pCur += 2;
}
} else if (pMap->m_WordMapType == FXCMAP_CMap::Range) {
- const FX_WORD* pCur = pMap->m_pWordMap;
- const FX_WORD* pEnd = pMap->m_pWordMap + pMap->m_WordCount * 3;
+ const uint16_t* pCur = pMap->m_pWordMap;
+ const uint16_t* pEnd = pMap->m_pWordMap + pMap->m_WordCount * 3;
while (pCur < pEnd) {
if (cid >= pCur[2] && cid <= pCur[2] + pCur[1] - pCur[0]) {
return pCur[0] + cid - pCur[2];
@@ -156,8 +156,8 @@ FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) {
}
while (1) {
if (pMap->m_DWordMapType == FXCMAP_CMap::Range) {
- const FX_WORD* pCur = pMap->m_pDWordMap;
- const FX_WORD* pEnd = pMap->m_pDWordMap + pMap->m_DWordCount * 4;
+ const uint16_t* pCur = pMap->m_pDWordMap;
+ const uint16_t* pEnd = pMap->m_pDWordMap + pMap->m_DWordCount * 4;
while (pCur < pEnd) {
if (cid >= pCur[3] && cid <= pCur[3] + pCur[2] - pCur[1]) {
return (((FX_DWORD)pCur[0] << 16) | pCur[1]) + cid - pCur[3];
@@ -165,8 +165,8 @@ FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) {
pCur += 4;
}
} else if (pMap->m_DWordMapType == FXCMAP_CMap::Single) {
- const FX_WORD* pCur = pMap->m_pDWordMap;
- const FX_WORD* pEnd = pMap->m_pDWordMap + pMap->m_DWordCount * 3;
+ const uint16_t* pCur = pMap->m_pDWordMap;
+ const uint16_t* pEnd = pMap->m_pDWordMap + pMap->m_DWordCount * 3;
while (pCur < pEnd) {
if (pCur[2] == cid) {
return ((FX_DWORD)pCur[0] << 16) | pCur[1];
@@ -183,7 +183,7 @@ FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) {
}
void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
- const FX_WORD*& pMap,
+ const uint16_t*& pMap,
FX_DWORD& count) {
CPDF_FontGlobals* pFontGlobals =
CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:37:04 +0000