diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-02-01 13:45:31 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-02-01 13:45:31 -0800 |
| commit | cb3a0557e7cbb205d1415969033ce3874a2bd3d8 (patch) | |
| tree | 947812bb6af16fdafa9be5fb427e043bba946617 /core/include/fpdfapi | |
| parent | b9cc7a0d0ece261db2cd2a1486b05e3338bca322 (diff) | |
| download | pdfium-cb3a0557e7cbb205d1415969033ce3874a2bd3d8.tar.xz | |
Merge to XFA: Remove the m_V5Type member variable from CPDF_Parser.chromium/2641chromium/2640chromium/2639chromium/2638
Use the type field in the m_ObjectInfo map instead.
BUG=pdfium:111
TBR=weili@chromium.org
Review URL: https://codereview.chromium.org/1650793002 .
(cherry picked from commit 93c196d868535f684007a7d3ed1f7146851a0ab9)
Review URL: https://codereview.chromium.org/1652083004 .
Diffstat (limited to 'core/include/fpdfapi')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 62c2a8b1a1..57120ec467 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -430,18 +430,17 @@ class CPDF_Parser { CFX_ByteString m_Password; struct ObjectInfo { - ObjectInfo() : pos(0) {} + ObjectInfo() : pos(0), type(0) {} FX_FILESIZE pos; -// TODO(thestig): Use fields below in place of |m_V5Type| and |m_ObjVersion| -#if 0 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_ByteArray m_V5Type; CFX_WordArray m_ObjVersion; CFX_FileSizeArray m_SortedOffset; CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers; |