diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-05 13:17:22 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-05 13:17:22 -0800 |
| commit | 360bc5ffb58e001dc7694967d79b29d54a935337 (patch) | |
| tree | e5d9aadaa7a4cacd394a529c0e7fa904458c46b2 /core/include | |
| parent | 9c98adb0404c4b161ceb71953772b79983afa55d (diff) | |
| download | pdfium-360bc5ffb58e001dc7694967d79b29d54a935337.tar.xz | |
Remove CFX_FileSizeArray.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1671113002 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 20 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 1 |
2 files changed, 9 insertions, 12 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index ffc29ef3ae..6620a71e2e 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -396,6 +396,14 @@ class CPDF_Parser { FX_DWORD GetFirstPageNo() const { return m_dwFirstPageNo; } protected: + struct ObjectInfo { + ObjectInfo() : pos(0), type(0), gennum(0) {} + + FX_FILESIZE pos; + uint8_t type; + uint16_t gennum; + }; + void CloseParser(); CPDF_Object* ParseDirect(CPDF_Object* pObj); FX_BOOL LoadAllCrossRefV4(FX_FILESIZE pos); @@ -412,7 +420,6 @@ class CPDF_Parser { Error LoadLinearizedMainXRefTable(); CPDF_StreamAcc* GetObjectStream(FX_DWORD number); FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset); - bool FindPosInOffsets(FX_FILESIZE pos) const; void SetEncryptDictionary(CPDF_Dictionary* pDict); void ShrinkObjectMap(FX_DWORD size); @@ -428,17 +435,8 @@ class CPDF_Parser { CFX_ByteString m_bsRecipient; CFX_ByteString m_FilePath; CFX_ByteString m_Password; - - struct ObjectInfo { - ObjectInfo() : pos(0), type(0), gennum(0) {} - - FX_FILESIZE pos; - uint8_t type; - uint16_t gennum; - }; std::map<FX_DWORD, ObjectInfo> m_ObjectInfo; - - CFX_FileSizeArray m_SortedOffset; + std::set<FX_FILESIZE> m_SortedOffset; CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers; FX_BOOL m_bVersionUpdated; CPDF_Object* m_pLinearized; diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 291aaaf9f8..449889efa0 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -438,7 +438,6 @@ class CFX_ArrayTemplate : public CFX_BasicArray { typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray; typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray; typedef CFX_ArrayTemplate<void*> CFX_PtrArray; -typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray; #ifdef PDF_ENABLE_XFA typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray; typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray; |