Chromium Code Reviews| Index: xfa/fgas/crt/fgas_codepage.cpp |
| diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp |
| index 4734a0005e38b82ef398e867007950e6ae478515..36c40a64697ac280ccee1aa2c2d9049d78be73e3 100644 |
| --- a/xfa/fgas/crt/fgas_codepage.cpp |
| +++ b/xfa/fgas/crt/fgas_codepage.cpp |
| @@ -309,12 +309,12 @@ uint16_t FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) { |
| if (iLength == 0) { |
| return 0xFFFF; |
| } |
| - uint32_t uHash = FX_HashCode_String_GetA(pStr, iLength, TRUE); |
| - int32_t iStart = 0, iMid; |
| + uint32_t uHash = FX_HashCode_GetA(CFX_ByteStringC(pStr, iLength), true); |
|
Lei Zhang
2016/04/23 01:33:29
The only FX_GetCodePageFromStringA() caller is on
Tom Sepez
2016/04/25 16:50:20
I think its better as part of a follow-up to kill
|
| + int32_t iStart = 0; |
| int32_t iEnd = sizeof(g_FXCPHashTable) / sizeof(FX_STR2CPHASH) - 1; |
| FXSYS_assert(iEnd >= 0); |
| do { |
| - iMid = (iStart + iEnd) / 2; |
| + int32_t iMid = (iStart + iEnd) / 2; |
| const FX_STR2CPHASH& cp = g_FXCPHashTable[iMid]; |
| if (uHash == cp.uHash) { |
| return (uint16_t)cp.uCodePage; |