summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa
diff options
context:
space:
mode:
authorWei Li <weili@chromium.org>2016-03-15 10:58:40 -0700
committerWei Li <weili@chromium.org>2016-03-15 10:58:40 -0700
commite40764862208b8cb76f507c489b01e3795fd93bd (patch)
treeea4c86bd75d17f91217df09747896a38e14934db /fpdfsdk/fpdfxfa
parent3cc180234c14639d408003c8180ba2963f0ea665 (diff)
downloadpdfium-e40764862208b8cb76f507c489b01e3795fd93bd.tar.xz
Modify xfa code to avoid c4800 warnings
BUG=pdfium:29 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1800793002 .
Diffstat (limited to 'fpdfsdk/fpdfxfa')
-rw-r--r--fpdfsdk/fpdfxfa/fpdfxfa_util.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
index 7814d8bd8a..7cabe0fb80 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp
@@ -20,10 +20,10 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer,
if (!m_pEnv)
return FWL_ERR_Indefinite;
- uint32_t uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);
+ int32_t id_event = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);
if (!s_TimerArray)
s_TimerArray = new std::vector<CFWL_TimerInfo*>;
- s_TimerArray->push_back(new CFWL_TimerInfo(uIDEvent, pTimer));
+ s_TimerArray->push_back(new CFWL_TimerInfo(id_event, pTimer));
hTimer = reinterpret_cast<FWL_HTIMER>(s_TimerArray->back());
return FWL_ERR_Succeeded;
}
@@ -33,7 +33,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer) {
return FWL_ERR_Indefinite;
CFWL_TimerInfo* pInfo = reinterpret_cast<CFWL_TimerInfo*>(hTimer);
- m_pEnv->FFI_KillTimer(pInfo->uIDEvent);
+ m_pEnv->FFI_KillTimer(pInfo->idEvent);
if (s_TimerArray) {
auto it = std::find(s_TimerArray->begin(), s_TimerArray->end(), pInfo);
if (it != s_TimerArray->end()) {
@@ -50,7 +50,7 @@ void CXFA_FWLAdapterTimerMgr::TimerProc(int32_t idEvent) {
return;
for (CFWL_TimerInfo* pInfo : *s_TimerArray) {
- if (pInfo->uIDEvent == idEvent) {
+ if (pInfo->idEvent == idEvent) {
pInfo->pTimer->Run(reinterpret_cast<FWL_HTIMER>(pInfo));
break;
}