Index: core/fpdfapi/fpdf_parser/include/cpdf_parser.h |
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h |
index 933ab1c7fa40cc8cd2e15f385cfcdfb57f79a2a2..45aca8f21a1f6b62cebb030a153d62a176ab74e5 100644 |
--- a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h |
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h |
@@ -38,7 +38,7 @@ class CPDF_Parser { |
~CPDF_Parser(); |
Error StartParse(IFX_FileRead* pFile); |
- FX_DWORD GetPermissions(FX_BOOL bCheckRevision = FALSE); |
+ uint32_t GetPermissions(FX_BOOL bCheckRevision = FALSE); |
void SetPassword(const FX_CHAR* password) { m_Password = password; } |
CFX_ByteString GetPassword() { return m_Password; } |
@@ -46,46 +46,46 @@ class CPDF_Parser { |
FX_FILESIZE GetLastXRefOffset() const { return m_LastXRefOffset; } |
CPDF_Document* GetDocument() const { return m_pDocument; } |
- FX_DWORD GetRootObjNum(); |
- FX_DWORD GetInfoObjNum(); |
+ uint32_t GetRootObjNum(); |
+ uint32_t GetInfoObjNum(); |
CPDF_Array* GetIDArray(); |
CPDF_Dictionary* GetEncryptDict() const { return m_pEncryptDict; } |
CPDF_Object* ParseIndirectObject(CPDF_IndirectObjectHolder* pObjList, |
- FX_DWORD objnum); |
+ uint32_t objnum); |
- FX_DWORD GetLastObjNum() const; |
- bool IsValidObjectNumber(FX_DWORD objnum) const; |
- FX_FILESIZE GetObjectPositionOrZero(FX_DWORD objnum) const; |
- uint8_t GetObjectType(FX_DWORD objnum) const; |
- uint16_t GetObjectGenNum(FX_DWORD objnum) const; |
+ uint32_t GetLastObjNum() const; |
+ bool IsValidObjectNumber(uint32_t objnum) const; |
+ FX_FILESIZE GetObjectPositionOrZero(uint32_t objnum) const; |
+ uint8_t GetObjectType(uint32_t objnum) const; |
+ uint16_t GetObjectGenNum(uint32_t objnum) const; |
bool IsVersionUpdated() const { return m_bVersionUpdated; } |
- bool IsObjectFreeOrNull(FX_DWORD objnum) const; |
- FX_BOOL IsFormStream(FX_DWORD objnum, FX_BOOL& bForm); |
+ bool IsObjectFreeOrNull(uint32_t objnum) const; |
+ FX_BOOL IsFormStream(uint32_t objnum, FX_BOOL& bForm); |
IPDF_CryptoHandler* GetCryptoHandler(); |
IFX_FileRead* GetFileAccess() const; |
- FX_FILESIZE GetObjectOffset(FX_DWORD objnum) const; |
- FX_FILESIZE GetObjectSize(FX_DWORD objnum) const; |
+ FX_FILESIZE GetObjectOffset(uint32_t objnum) const; |
+ FX_FILESIZE GetObjectSize(uint32_t objnum) const; |
- void GetIndirectBinary(FX_DWORD objnum, uint8_t*& pBuffer, FX_DWORD& size); |
+ void GetIndirectBinary(uint32_t objnum, uint8_t*& pBuffer, uint32_t& size); |
int GetFileVersion() const { return m_FileVersion; } |
FX_BOOL IsXRefStream() const { return m_bXRefStream; } |
CPDF_Object* ParseIndirectObjectAt(CPDF_IndirectObjectHolder* pObjList, |
FX_FILESIZE pos, |
- FX_DWORD objnum); |
+ uint32_t objnum); |
CPDF_Object* ParseIndirectObjectAtByStrict( |
CPDF_IndirectObjectHolder* pObjList, |
FX_FILESIZE pos, |
- FX_DWORD objnum, |
+ uint32_t objnum, |
FX_FILESIZE* pResultPos); |
Error StartAsyncParse(IFX_FileRead* pFile); |
- FX_DWORD GetFirstPageNo() const { return m_dwFirstPageNo; } |
+ uint32_t GetFirstPageNo() const { return m_dwFirstPageNo; } |
protected: |
struct ObjectInfo { |
@@ -106,14 +106,14 @@ class CPDF_Parser { |
FX_BOOL RebuildCrossRef(); |
Error SetEncryptHandler(); |
void ReleaseEncryptHandler(); |
- FX_BOOL LoadLinearizedAllCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount); |
- FX_BOOL LoadLinearizedCrossRefV4(FX_FILESIZE pos, FX_DWORD dwObjCount); |
+ FX_BOOL LoadLinearizedAllCrossRefV4(FX_FILESIZE pos, uint32_t dwObjCount); |
+ FX_BOOL LoadLinearizedCrossRefV4(FX_FILESIZE pos, uint32_t dwObjCount); |
FX_BOOL LoadLinearizedAllCrossRefV5(FX_FILESIZE pos); |
Error LoadLinearizedMainXRefTable(); |
- CPDF_StreamAcc* GetObjectStream(FX_DWORD number); |
- FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset); |
+ CPDF_StreamAcc* GetObjectStream(uint32_t number); |
+ FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, uint32_t offset); |
void SetEncryptDictionary(CPDF_Dictionary* pDict); |
- void ShrinkObjectMap(FX_DWORD size); |
+ void ShrinkObjectMap(uint32_t size); |
CPDF_Document* m_pDocument; |
std::unique_ptr<CPDF_SyntaxParser> m_pSyntax; |
@@ -127,27 +127,27 @@ class CPDF_Parser { |
CFX_ByteString m_bsRecipient; |
CFX_ByteString m_FilePath; |
CFX_ByteString m_Password; |
- std::map<FX_DWORD, ObjectInfo> m_ObjectInfo; |
+ std::map<uint32_t, ObjectInfo> m_ObjectInfo; |
std::set<FX_FILESIZE> m_SortedOffset; |
CFX_ArrayTemplate<CPDF_Dictionary*> m_Trailers; |
bool m_bVersionUpdated; |
CPDF_Object* m_pLinearized; |
- FX_DWORD m_dwFirstPageNo; |
- FX_DWORD m_dwXrefStartObjNum; |
+ uint32_t m_dwFirstPageNo; |
+ uint32_t m_dwXrefStartObjNum; |
// A map of object numbers to indirect streams. Map owns the streams. |
- std::map<FX_DWORD, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap; |
+ std::map<uint32_t, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap; |
// Mapping of object numbers to offsets. The offsets are relative to the first |
// object in the stream. |
- using StreamObjectCache = std::map<FX_DWORD, FX_DWORD>; |
+ using StreamObjectCache = std::map<uint32_t, uint32_t>; |
// Mapping of streams to their object caches. This is valid as long as the |
// streams in |m_ObjectStreamMap| are valid. |
std::map<CPDF_StreamAcc*, StreamObjectCache> m_ObjCache; |
// All indirect object numbers that are being parsed. |
- std::set<FX_DWORD> m_ParsingObjNums; |
+ std::set<uint32_t> m_ParsingObjNums; |
friend class CPDF_DataAvail; |