diff options
| author | tsepez <tsepez@chromium.org> | 2016-03-25 14:19:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 14:19:51 -0700 |
| commit | 736f28ab2434e2da1de66ff91b64741483ff9cba (patch) | |
| tree | ce46fdc563828d8ae671f898c551311d85ecea0f /xfa/fxfa/parser/xfa_localemgr.cpp | |
| parent | 342f6fa66f6d843fe07d9b6a133656f83c8d62f6 (diff) | |
| download | pdfium-736f28ab2434e2da1de66ff91b64741483ff9cba.tar.xz | |
Remove FX_DWORD from XFA.
Review URL: https://codereview.chromium.org/1830323006
Diffstat (limited to 'xfa/fxfa/parser/xfa_localemgr.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_localemgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index dc511abf7c..ce638a3b97 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -1048,7 +1048,7 @@ static IFX_Locale* XFA_GetLocaleFromBuffer(const uint8_t* pBuf, int nBufLen) { } CXML_Element* pLocale = NULL; uint8_t* pOut = NULL; - FX_DWORD dwSize; + uint32_t dwSize; pCodecMgr->GetFlateModule()->FlateOrLZWDecode(FALSE, pBuf, nBufLen, TRUE, 0, 0, 0, 0, 0, pOut, dwSize); if (pOut) { @@ -1066,8 +1066,8 @@ static uint16_t XFA_GetLanguage(CFX_WideString wsLanguage) { return dwLangueID; } wsLanguage.MakeLower(); - FX_DWORD dwIDFirst = wsLanguage.GetAt(0) << 8 | wsLanguage.GetAt(1); - FX_DWORD dwIDSecond = wsLanguage.GetLength() >= 5 + uint32_t dwIDFirst = wsLanguage.GetAt(0) << 8 | wsLanguage.GetAt(1); + uint32_t dwIDSecond = wsLanguage.GetLength() >= 5 ? wsLanguage.GetAt(3) << 8 | wsLanguage.GetAt(4) : 0; switch (dwIDFirst) { |