diff options
| author | Wei Li <weili@chromium.org> | 2016-03-11 17:00:48 -0800 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-03-11 17:00:48 -0800 |
| commit | 97da97662417085774f75c26e535c6fbe70266ae (patch) | |
| tree | 9654be693dfb20b49be80911fa8089ff319757f3 /fpdfsdk/src/fsdk_baseannot.cpp | |
| parent | 55265016faac358266af280db6c62afa34ce2891 (diff) | |
| download | pdfium-97da97662417085774f75c26e535c6fbe70266ae.tar.xz | |
Re-enable MSVC warning 4800 for compiling with chromium_code
Mainly change the code to avoid the warnings; in a few cases we have
to use explicit casts.
BUG=pdfium:29
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1783023002 .
Diffstat (limited to 'fpdfsdk/src/fsdk_baseannot.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseannot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index b007e68fa1..276d302bdd 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -623,11 +623,11 @@ FX_SYSTEMTIME CPDFSDK_BAAnnot::GetModifiedDate() const { return systime; } -void CPDFSDK_BAAnnot::SetFlags(int nFlags) { +void CPDFSDK_BAAnnot::SetFlags(FX_DWORD nFlags) { m_pAnnot->GetAnnotDict()->SetAtInteger("F", nFlags); } -int CPDFSDK_BAAnnot::GetFlags() const { +FX_DWORD CPDFSDK_BAAnnot::GetFlags() const { return m_pAnnot->GetAnnotDict()->GetIntegerBy("F"); } @@ -885,7 +885,7 @@ FX_BOOL CPDFSDK_BAAnnot::CreateFormFiller() { return TRUE; } FX_BOOL CPDFSDK_BAAnnot::IsVisible() const { - int nFlags = GetFlags(); + FX_DWORD nFlags = GetFlags(); return !((nFlags & ANNOTFLAG_INVISIBLE) || (nFlags & ANNOTFLAG_HIDDEN) || (nFlags & ANNOTFLAG_NOVIEW)); } |