Make CPDF_Parser::GetObjectTypeFromCrossRefStreamType() anonymous. Move it into an anonymous namespace inside cpdf_parser.cpp, because that is the necessary scope. Change-Id: I7c5913e703c82ccf8fee72a8497be4c0a5d2b5fc Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/86172 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp index 89505dc..2cf653a 100644 --- a/core/fpdfapi/parser/cpdf_parser.cpp +++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -55,6 +55,20 @@ uint32_t obj_count; }; +CPDF_Parser::ObjectType GetObjectTypeFromCrossRefStreamType( + uint32_t cross_ref_stream_type) { + switch (cross_ref_stream_type) { + case 0: + return CPDF_Parser::ObjectType::kFree; + case 1: + return CPDF_Parser::ObjectType::kNotCompressed; + case 2: + return CPDF_Parser::ObjectType::kCompressed; + default: + return CPDF_Parser::ObjectType::kNull; + } +} + uint32_t GetVarInt(pdfium::span<const uint8_t> input) { uint32_t result = 0; for (uint8_t c : input) @@ -1117,20 +1131,6 @@ return SUCCESS; } -CPDF_Parser::ObjectType CPDF_Parser::GetObjectTypeFromCrossRefStreamType( - uint32_t cross_ref_stream_type) const { - switch (cross_ref_stream_type) { - case 0: - return CPDF_Parser::ObjectType::kFree; - case 1: - return CPDF_Parser::ObjectType::kNotCompressed; - case 2: - return CPDF_Parser::ObjectType::kCompressed; - default: - return CPDF_Parser::ObjectType::kNull; - } -} - void CPDF_Parser::SetSyntaxParserForTesting( std::unique_ptr<CPDF_SyntaxParser> parser) { m_pSyntax = std::move(parser);
diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h index ba49609..aee0550 100644 --- a/core/fpdfapi/parser/cpdf_parser.h +++ b/core/fpdfapi/parser/cpdf_parser.h
@@ -174,8 +174,6 @@ bool ParseFileVersion(); ObjectType GetObjectType(uint32_t objnum) const; - ObjectType GetObjectTypeFromCrossRefStreamType( - uint32_t cross_ref_stream_type) const; std::unique_ptr<CPDF_SyntaxParser> m_pSyntax; std::unique_ptr<ParsedObjectsHolder> m_pOwnedObjectsHolder;