| Index: core/include/fxcrt/fx_ext.h
|
| diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
|
| index 03ec488135a4671366e43dc64672fb7fffb0dd31..8606f5c83dadee43dc17ff063042a0cfee96cd93 100644
|
| --- a/core/include/fxcrt/fx_ext.h
|
| +++ b/core/include/fxcrt/fx_ext.h
|
| @@ -1,7 +1,7 @@
|
| // 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 _FXCRT_EXTENSION_
|
| @@ -25,35 +25,36 @@
|
| extern "C" {
|
| #endif
|
|
|
| -
|
| -FX_FLOAT FXSYS_tan(FX_FLOAT a);
|
| -FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x);
|
| -FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr, FX_INT32 iLength = -1, FX_INT32 *pUsedLen = NULL);
|
| -FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr, FX_INT32 iLength = -1, FX_INT32 *pUsedLen = NULL);
|
| -FX_LPWSTR FXSYS_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count);
|
| -FX_INT32 FXSYS_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count);
|
| -FX_INT32 FXSYS_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count);
|
| -inline FX_BOOL FXSYS_islower(FX_INT32 ch)
|
| -{
|
| - return ch >= 'a' && ch <= 'z';
|
| +FX_FLOAT FXSYS_tan(FX_FLOAT a);
|
| +FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x);
|
| +FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr,
|
| + FX_INT32 iLength = -1,
|
| + FX_INT32* pUsedLen = NULL);
|
| +FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr,
|
| + FX_INT32 iLength = -1,
|
| + FX_INT32* pUsedLen = NULL);
|
| +FX_LPWSTR FXSYS_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count);
|
| +FX_INT32 FXSYS_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count);
|
| +FX_INT32 FXSYS_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count);
|
| +inline FX_BOOL FXSYS_islower(FX_INT32 ch) {
|
| + return ch >= 'a' && ch <= 'z';
|
| }
|
| -inline FX_BOOL FXSYS_isupper(FX_INT32 ch)
|
| -{
|
| - return ch >= 'A' && ch <= 'Z';
|
| +inline FX_BOOL FXSYS_isupper(FX_INT32 ch) {
|
| + return ch >= 'A' && ch <= 'Z';
|
| }
|
| -inline FX_INT32 FXSYS_tolower(FX_INT32 ch)
|
| -{
|
| - return ch < 'A' || ch > 'Z' ? ch : (ch + 0x20);
|
| +inline FX_INT32 FXSYS_tolower(FX_INT32 ch) {
|
| + return ch < 'A' || ch > 'Z' ? ch : (ch + 0x20);
|
| }
|
| -inline FX_INT32 FXSYS_toupper(FX_INT32 ch)
|
| -{
|
| - return ch < 'a' || ch > 'z' ? ch : (ch - 0x20);
|
| +inline FX_INT32 FXSYS_toupper(FX_INT32 ch) {
|
| + return ch < 'a' || ch > 'z' ? ch : (ch - 0x20);
|
| }
|
|
|
| -
|
| -
|
| -FX_DWORD FX_HashCode_String_GetA(FX_LPCSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase = FALSE);
|
| -FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase = FALSE);
|
| +FX_DWORD FX_HashCode_String_GetA(FX_LPCSTR pStr,
|
| + FX_INT32 iLength,
|
| + FX_BOOL bIgnoreCase = FALSE);
|
| +FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr,
|
| + FX_INT32 iLength,
|
| + FX_BOOL bIgnoreCase = FALSE);
|
|
|
| #ifdef __cplusplus
|
| }
|
| @@ -62,42 +63,40 @@ FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr, FX_INT32 iLength, FX_BOOL bIgn
|
| extern "C" {
|
| #endif
|
|
|
| -FX_LPVOID FX_Random_MT_Start(FX_DWORD dwSeed);
|
| +FX_LPVOID FX_Random_MT_Start(FX_DWORD dwSeed);
|
|
|
| -FX_DWORD FX_Random_MT_Generate(FX_LPVOID pContext);
|
| +FX_DWORD FX_Random_MT_Generate(FX_LPVOID pContext);
|
|
|
| -void FX_Random_MT_Close(FX_LPVOID pContext);
|
| +void FX_Random_MT_Close(FX_LPVOID pContext);
|
|
|
| -void FX_Random_GenerateBase(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
| +void FX_Random_GenerateBase(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
|
|
| -void FX_Random_GenerateMT(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
| +void FX_Random_GenerateMT(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
|
|
| -void FX_Random_GenerateCrypto(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
| +void FX_Random_GenerateCrypto(FX_LPDWORD pBuffer, FX_INT32 iCount);
|
| #ifdef __cplusplus
|
| }
|
| #endif
|
| -template<class baseType>
|
| -class CFX_SSortTemplate
|
| -{
|
| -public:
|
| - void ShellSort(baseType *pArray, FX_INT32 iCount)
|
| - {
|
| - FXSYS_assert(pArray != NULL && iCount > 0);
|
| - FX_INT32 i, j, gap;
|
| - baseType v1, v2;
|
| - gap = iCount >> 1;
|
| - while (gap > 0) {
|
| - for (i = gap; i < iCount; i ++) {
|
| - j = i - gap;
|
| - v1 = pArray[i];
|
| - while (j > -1 && (v2 = pArray[j]) > v1) {
|
| - pArray[j + gap] = v2;
|
| - j -= gap;
|
| - }
|
| - pArray[j + gap] = v1;
|
| - }
|
| - gap >>= 1;
|
| +template <class baseType>
|
| +class CFX_SSortTemplate {
|
| + public:
|
| + void ShellSort(baseType* pArray, FX_INT32 iCount) {
|
| + FXSYS_assert(pArray != NULL && iCount > 0);
|
| + FX_INT32 i, j, gap;
|
| + baseType v1, v2;
|
| + gap = iCount >> 1;
|
| + while (gap > 0) {
|
| + for (i = gap; i < iCount; i++) {
|
| + j = i - gap;
|
| + v1 = pArray[i];
|
| + while (j > -1 && (v2 = pArray[j]) > v1) {
|
| + pArray[j + gap] = v2;
|
| + j -= gap;
|
| }
|
| + pArray[j + gap] = v1;
|
| + }
|
| + gap >>= 1;
|
| }
|
| + }
|
| };
|
| #endif
|
|
|