From d120920fe18bcfa3c102ecd0c7502c00d5f0425a Mon Sep 17 00:00:00 2001 From: Artem Strygin Date: Thu, 31 Aug 2017 16:59:39 +0300 Subject: Fix code style. rename m_linearized_first_page_cross_ref_start_obj_num --> m_dwLinearizedFirstPageXRefStartObjNum Change-Id: I12194169f10df445d7c81305491775c15c400fad Reviewed-on: https://pdfium-review.googlesource.com/12630 Commit-Queue: Art Snake Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/parser/cpdf_parser.cpp | 8 ++++---- core/fpdfapi/parser/cpdf_parser.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp index 3bd0574000..c57d65e78e 100644 --- a/core/fpdfapi/parser/cpdf_parser.cpp +++ b/core/fpdfapi/parser/cpdf_parser.cpp @@ -116,7 +116,7 @@ CPDF_Parser::CPDF_Parser() m_FileVersion(0), m_pEncryptDict(nullptr), m_TrailerData(pdfium::MakeUnique()), - m_linearized_first_page_cross_ref_start_obj_num(0) {} + m_dwLinearizedFirstPageXRefStartObjNum(0) {} CPDF_Parser::~CPDF_Parser() { ReleaseEncryptHandler(); @@ -1401,7 +1401,7 @@ CPDF_Parser::Error CPDF_Parser::StartLinearizedParse( bXRefRebuilt = true; m_LastXRefOffset = 0; } - m_linearized_first_page_cross_ref_start_obj_num = + m_dwLinearizedFirstPageXRefStartObjNum = m_ObjectInfo.empty() ? 0 : m_ObjectInfo.begin()->first; if (bLoadV4) { std::unique_ptr trailer = LoadTrailerV4(); @@ -1497,8 +1497,8 @@ CPDF_Parser::Error CPDF_Parser::LoadLinearizedMainXRefTable() { // objnum. // And should have count equals to first obj number of first page cross ref // table. - if (!LoadLinearizedAllCrossRefV4( - m_LastXRefOffset, m_linearized_first_page_cross_ref_start_obj_num) && + if (!LoadLinearizedAllCrossRefV4(m_LastXRefOffset, + m_dwLinearizedFirstPageXRefStartObjNum) && !LoadLinearizedAllCrossRefV5(m_LastXRefOffset)) { m_LastXRefOffset = 0; m_pSyntax->m_MetadataObjnum = dwSaveMetadataObjnum; diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h index 437f214db6..10c70357da 100644 --- a/core/fpdfapi/parser/cpdf_parser.h +++ b/core/fpdfapi/parser/cpdf_parser.h @@ -199,7 +199,7 @@ class CPDF_Parser { CFX_ByteString m_Password; std::unique_ptr m_TrailerData; std::unique_ptr m_pLinearized; - uint32_t m_linearized_first_page_cross_ref_start_obj_num; + uint32_t m_dwLinearizedFirstPageXRefStartObjNum; // A map of object numbers to indirect streams. std::map> m_ObjectStreamMap; -- cgit v1.2.3