From 97da97662417085774f75c26e535c6fbe70266ae Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 11 Mar 2016 17:00:48 -0800 Subject: 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 . --- core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp | 2 +- core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp | 9 +++++---- core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'core/src/fpdfapi/fpdf_parser') diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp index 6256f4c526..84464fcff2 100644 --- a/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp +++ b/core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp @@ -267,7 +267,7 @@ FX_BOOL CPDF_HintTables::ReadSharedObjHintTable(CFX_BitStream* hStream, if (!CanReadFromBitStream(hStream, required_bits)) return FALSE; - for (int i = 0; i < dwSharedObjTotal; ++i) { + for (FX_DWORD i = 0; i < dwSharedObjTotal; ++i) { dwPrevObjLen = dwCurObjLen; FX_SAFE_DWORD safeObjLen = hStream->GetBits(dwDeltaGroupLen); safeObjLen += dwGroupLeastLen; diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp index c9a2d8d496..e9332901c0 100644 --- a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp @@ -55,6 +55,7 @@ CPDF_Parser::CPDF_Parser() m_FileVersion(0), m_pTrailer(nullptr), m_pEncryptDict(nullptr), + m_bVersionUpdated(false), m_pLinearized(nullptr), m_dwFirstPageNo(0), m_dwXrefStartObjNum(0) { @@ -124,7 +125,7 @@ void CPDF_Parser::ShrinkObjectMap(FX_DWORD objnum) { } void CPDF_Parser::CloseParser() { - m_bVersionUpdated = FALSE; + m_bVersionUpdated = false; delete m_pDocument; m_pDocument = nullptr; @@ -466,7 +467,7 @@ FX_BOOL CPDF_Parser::LoadLinearizedCrossRefV4(FX_FILESIZE pos, m_ObjectInfo[objnum].pos = offset; int32_t version = FXSYS_atoi(pEntry + 11); if (version >= 1) - m_bVersionUpdated = TRUE; + m_bVersionUpdated = true; m_ObjectInfo[objnum].gennum = version; if (m_ObjectInfo[objnum].pos < m_pSyntax->m_FileLen) @@ -541,7 +542,7 @@ bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos, m_ObjectInfo[objnum].pos = offset; int32_t version = FXSYS_atoi(pEntry + 11); if (version >= 1) - m_bVersionUpdated = TRUE; + m_bVersionUpdated = true; m_ObjectInfo[objnum].gennum = version; if (m_ObjectInfo[objnum].pos < m_pSyntax->m_FileLen) @@ -775,7 +776,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { m_ObjectInfo[objnum].pos = obj_pos; m_ObjectInfo[objnum].gennum = gennum; if (oldgen != gennum) - m_bVersionUpdated = TRUE; + m_bVersionUpdated = true; } } else { m_ObjectInfo[objnum].pos = obj_pos; diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp index b414827f95..89ad5eec33 100644 --- a/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp @@ -772,7 +772,8 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, GetNextWordInternal(nullptr); int numMarkers = ReadEOLMarkers(m_Pos); - if (m_WordSize == kEndObjStr.GetLength() && numMarkers != 0 && + if (m_WordSize == static_cast(kEndObjStr.GetLength()) && + numMarkers != 0 && FXSYS_memcmp(m_WordBuffer, kEndObjStr.GetPtr(), kEndObjStr.GetLength()) == 0) { m_Pos = streamStartPos; -- cgit v1.2.3