| Index: xfa/src/fgas/include/fx_alg.h
|
| diff --git a/xfa/src/fgas/include/fx_alg.h b/xfa/src/fgas/include/fx_alg.h
|
| index ed946641f2afc36efa38b9b688d94f9c61bb237c..0ee8508083052800367737dc81014e9090b634a2 100644
|
| --- a/xfa/src/fgas/include/fx_alg.h
|
| +++ b/xfa/src/fgas/include/fx_alg.h
|
| @@ -10,11 +10,11 @@
|
| #ifdef __cplusplus
|
| extern "C" {
|
| #endif
|
| -FX_INT32 FX_Base64EncodeA(FX_LPCBYTE pSrc, FX_INT32 iSrcLen, FX_LPSTR pDst);
|
| -FX_INT32 FX_Base64DecodeA(FX_LPCSTR pSrc, FX_INT32 iSrcLen, FX_LPBYTE pDst);
|
| -FX_INT32 FX_Base64DecodeW(FX_LPCWSTR pSrc, FX_INT32 iSrcLen, FX_LPBYTE pDst);
|
| -FX_BYTE FX_Hex2Dec(FX_BYTE hexHigh, FX_BYTE hexLow);
|
| -FX_INT32 FX_SeparateStringW(FX_LPCWSTR pStr, FX_INT32 iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces);
|
| +int32_t FX_Base64EncodeA(FX_LPCBYTE pSrc, int32_t iSrcLen, FX_LPSTR pDst);
|
| +int32_t FX_Base64DecodeA(FX_LPCSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst);
|
| +int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst);
|
| +uint8_t FX_Hex2Dec(uint8_t hexHigh, uint8_t hexLow);
|
| +int32_t FX_SeparateStringW(FX_LPCWSTR pStr, int32_t iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces);
|
| #ifdef __cplusplus
|
| };
|
| #endif
|
| @@ -22,13 +22,13 @@ template<class baseType>
|
| class CFX_DSPATemplate
|
| {
|
| public:
|
| - FX_INT32 Lookup(const baseType &find, const baseType *pArray, FX_INT32 iCount)
|
| + int32_t Lookup(const baseType &find, const baseType *pArray, int32_t iCount)
|
| {
|
| FXSYS_assert(pArray != NULL);
|
| if (iCount < 1) {
|
| return -1;
|
| }
|
| - FX_INT32 iStart = 0, iEnd = iCount - 1, iMid;
|
| + int32_t iStart = 0, iEnd = iCount - 1, iMid;
|
| do {
|
| iMid = (iStart + iEnd) / 2;
|
| const baseType &v = pArray[iMid];
|
|
|