summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-01 14:52:40 -0800
committerLei Zhang <thestig@chromium.org>2016-02-01 14:52:40 -0800
commit05797682103f8c724bc21fa197ee6f9f6515081e (patch)
tree0c2247e684b0945b003335da4b84edb0b7100dc0 /core/include/fpdfapi
parentcb3a0557e7cbb205d1415969033ce3874a2bd3d8 (diff)
downloadpdfium-05797682103f8c724bc21fa197ee6f9f6515081e.tar.xz
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 .
Diffstat (limited to 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/fpdf_parser.h6
1 files changed, 1 insertions, 5 deletions
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<FX_DWORD, ObjectInfo> m_ObjectInfo;
- CFX_WordArray m_ObjVersion;
CFX_FileSizeArray m_SortedOffset;
CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers;
FX_BOOL m_bVersionUpdated;