summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
authorWei Li <weili@chromium.org>2016-03-11 17:00:48 -0800
committerWei Li <weili@chromium.org>2016-03-11 17:00:48 -0800
commit97da97662417085774f75c26e535c6fbe70266ae (patch)
tree9654be693dfb20b49be80911fa8089ff319757f3 /core/include/fpdfapi
parent55265016faac358266af280db6c62afa34ce2891 (diff)
downloadpdfium-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 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/cpdf_parser.h2
-rw-r--r--core/include/fpdfapi/fpdf_serial.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/include/fpdfapi/cpdf_parser.h b/core/include/fpdfapi/cpdf_parser.h
index 4ec8d988e0..f2d7343e87 100644
--- a/core/include/fpdfapi/cpdf_parser.h
+++ b/core/include/fpdfapi/cpdf_parser.h
@@ -130,7 +130,7 @@ class CPDF_Parser {
std::map<FX_DWORD, ObjectInfo> m_ObjectInfo;
std::set<FX_FILESIZE> m_SortedOffset;
CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers;
- FX_BOOL m_bVersionUpdated;
+ bool m_bVersionUpdated;
CPDF_Object* m_pLinearized;
FX_DWORD m_dwFirstPageNo;
FX_DWORD m_dwXrefStartObjNum;
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 8cf3fb8a1e..cb0c290783 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -26,7 +26,7 @@ class CPDF_Creator {
~CPDF_Creator();
void RemoveSecurity();
- FX_BOOL Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0);
+ bool Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0);
int32_t Continue(IFX_Pause* pPause = NULL);
FX_BOOL SetFileVersion(int32_t fileVersion = 17);
@@ -57,7 +57,7 @@ class CPDF_Creator {
int32_t m_ObjectStreamSize;
FX_DWORD m_dwLastObjNum;
- FX_BOOL Create(FX_DWORD flags);
+ bool Create(FX_DWORD flags);
void ResetStandardSecurity();
void Clear();
int32_t WriteDoc_Stage1(IFX_Pause* pPause);