From 05797682103f8c724bc21fa197ee6f9f6515081e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 1 Feb 2016 14:52:40 -0800 Subject: Merge to XFA: Remove the m_ObjVersion member variable from CPDF_Parser. Use the gennum field in the m_ObjectInfo map instead. BUG=pdfium:111 R=weili@chromium.org TBR=weili@chromium.org Review URL: https://codereview.chromium.org/1654303002 . (cherry picked from commit a620372c9e1d0ff825bcbe6620fe7e1b63c769c2) Review URL: https://codereview.chromium.org/1653023004 . --- core/include/fpdfapi/fpdf_parser.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'core/include/fpdfapi') diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 57120ec467..ffc29ef3ae 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -430,18 +430,14 @@ class CPDF_Parser { CFX_ByteString m_Password; struct ObjectInfo { - ObjectInfo() : pos(0), type(0) {} + ObjectInfo() : pos(0), type(0), gennum(0) {} FX_FILESIZE pos; uint8_t type; -// TODO(thestig): Use field below in place of |m_ObjVersion| -#if 0 uint16_t gennum; -#endif }; std::map m_ObjectInfo; - CFX_WordArray m_ObjVersion; CFX_FileSizeArray m_SortedOffset; CFX_ArrayTemplate m_Trailers; FX_BOOL m_bVersionUpdated; -- cgit v1.2.3