summaryrefslogtreecommitdiff
path: root/core/fxcrt/fx_basic_utf.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-25 15:18:35 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 15:18:36 -0700
commitb5e8f14e3eefc5da995b332788d3203cee204883 (patch)
tree34fc80504d2034013b18f30df1b0f6f1a94e2d70 /core/fxcrt/fx_basic_utf.cpp
parent6d18bd3b8ec82ae3c24a439f5c7925786a0e2d8b (diff)
downloadpdfium-b5e8f14e3eefc5da995b332788d3203cee204883.tar.xz
Remove FX_DWORD from core/ and delete definitionchromium/2695chromium/2694chromium/2693chromium/2692
Review URL: https://codereview.chromium.org/1832173003
Diffstat (limited to 'core/fxcrt/fx_basic_utf.cpp')
-rw-r--r--core/fxcrt/fx_basic_utf.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fxcrt/fx_basic_utf.cpp b/core/fxcrt/fx_basic_utf.cpp
index 08b9ca6ba6..e1996999f8 100644
--- a/core/fxcrt/fx_basic_utf.cpp
+++ b/core/fxcrt/fx_basic_utf.cpp
@@ -10,7 +10,7 @@ void CFX_UTF8Decoder::Clear() {
m_Buffer.Clear();
m_PendingBytes = 0;
}
-void CFX_UTF8Decoder::AppendChar(FX_DWORD ch) {
+void CFX_UTF8Decoder::AppendChar(uint32_t ch) {
m_Buffer.AppendChar((FX_WCHAR)ch);
}
void CFX_UTF8Decoder::Input(uint8_t byte) {
@@ -44,20 +44,20 @@ void CFX_UTF8Decoder::Input(uint8_t byte) {
}
}
void CFX_UTF8Encoder::Input(FX_WCHAR unicode) {
- if ((FX_DWORD)unicode < 0x80) {
+ if ((uint32_t)unicode < 0x80) {
m_Buffer.AppendChar(unicode);
} else {
- if ((FX_DWORD)unicode >= 0x80000000) {
+ if ((uint32_t)unicode >= 0x80000000) {
return;
}
int nbytes = 0;
- if ((FX_DWORD)unicode < 0x800) {
+ if ((uint32_t)unicode < 0x800) {
nbytes = 2;
- } else if ((FX_DWORD)unicode < 0x10000) {
+ } else if ((uint32_t)unicode < 0x10000) {
nbytes = 3;
- } else if ((FX_DWORD)unicode < 0x200000) {
+ } else if ((uint32_t)unicode < 0x200000) {
nbytes = 4;
- } else if ((FX_DWORD)unicode < 0x4000000) {
+ } else if ((uint32_t)unicode < 0x4000000) {
nbytes = 5;
} else {
nbytes = 6;