Index: core/include/fpdfapi/fpdf_serial.h |
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h |
index a91870b5a5f67964b0a7af28f62bc382657b164d..36ede10a556ca16027205859ab81f09e759e29cd 100644 |
--- a/core/include/fpdfapi/fpdf_serial.h |
+++ b/core/include/fpdfapi/fpdf_serial.h |
@@ -14,192 +14,199 @@ |
#endif |
class CPDF_ObjectStream; |
class CPDF_XRefStream; |
-CFX_ByteTextBuf& operator << (CFX_ByteTextBuf& buf, const CPDF_Object* pObj); |
-class CPDF_ObjArchiveSaver : public CFX_ArchiveSaver |
-{ |
-public: |
- |
- friend CPDF_ObjArchiveSaver& operator << (CPDF_ObjArchiveSaver& ar, const CPDF_Object* pObj); |
-protected: |
- |
- CFX_MapPtrToPtr m_ObjectMap; |
+CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& buf, const CPDF_Object* pObj); |
+class CPDF_ObjArchiveSaver : public CFX_ArchiveSaver { |
+ public: |
+ friend CPDF_ObjArchiveSaver& operator<<(CPDF_ObjArchiveSaver& ar, |
+ const CPDF_Object* pObj); |
+ |
+ protected: |
+ CFX_MapPtrToPtr m_ObjectMap; |
}; |
-class CPDF_ObjArchiveLoader : public CFX_ArchiveLoader |
-{ |
-public: |
- |
- CPDF_ObjArchiveLoader(FX_LPCBYTE pData, FX_DWORD dwSize) : CFX_ArchiveLoader(pData, dwSize), |
- m_IndirectObjects(NULL) {} |
+class CPDF_ObjArchiveLoader : public CFX_ArchiveLoader { |
+ public: |
+ CPDF_ObjArchiveLoader(FX_LPCBYTE pData, FX_DWORD dwSize) |
+ : CFX_ArchiveLoader(pData, dwSize), m_IndirectObjects(NULL) {} |
- friend CPDF_ObjArchiveLoader& operator >> (CPDF_ObjArchiveLoader& ar, CPDF_Object*& pObj); |
-protected: |
+ friend CPDF_ObjArchiveLoader& operator>>(CPDF_ObjArchiveLoader& ar, |
+ CPDF_Object*& pObj); |
- CPDF_IndirectObjects m_IndirectObjects; |
+ protected: |
+ CPDF_IndirectObjects m_IndirectObjects; |
}; |
-class CPDF_PageArchiveSaver : public CPDF_ObjArchiveSaver |
-{ |
-public: |
- |
- CPDF_PageArchiveSaver(CPDF_PageObjects* pPageObjs); |
- |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_PageObject* pObj); |
- |
+class CPDF_PageArchiveSaver : public CPDF_ObjArchiveSaver { |
+ public: |
+ CPDF_PageArchiveSaver(CPDF_PageObjects* pPageObjs); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_PageObject* pObj); |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_ClipPath clip_path); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_ClipPath clip_path); |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_GraphState graph_state); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_GraphState graph_state); |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_TextState text_state); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_TextState text_state); |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_ColorState color_state); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_ColorState color_state); |
- friend CPDF_PageArchiveSaver& operator << (CPDF_PageArchiveSaver& ar, CPDF_GeneralState general_state); |
+ friend CPDF_PageArchiveSaver& operator<<(CPDF_PageArchiveSaver& ar, |
+ CPDF_GeneralState general_state); |
-protected: |
+ protected: |
+ CPDF_ClipPath m_LastClipPath; |
- CPDF_ClipPath m_LastClipPath; |
+ CPDF_GraphState m_LastGraphState; |
- CPDF_GraphState m_LastGraphState; |
+ CPDF_ColorState m_LastColorState; |
- CPDF_ColorState m_LastColorState; |
+ CPDF_TextState m_LastTextState; |
- CPDF_TextState m_LastTextState; |
+ CPDF_GeneralState m_LastGeneralState; |
- CPDF_GeneralState m_LastGeneralState; |
- |
- CPDF_PageObjects* m_pCurPage; |
+ CPDF_PageObjects* m_pCurPage; |
}; |
-class CPDF_PageArchiveLoader : public CPDF_ObjArchiveLoader |
-{ |
-public: |
- |
- CPDF_PageArchiveLoader(CPDF_PageObjects* pPageObjs, FX_LPCBYTE pData, FX_DWORD dwSize); |
- |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_PageObject*& pObj); |
+class CPDF_PageArchiveLoader : public CPDF_ObjArchiveLoader { |
+ public: |
+ CPDF_PageArchiveLoader(CPDF_PageObjects* pPageObjs, |
+ FX_LPCBYTE pData, |
+ FX_DWORD dwSize); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_PageObject*& pObj); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_ClipPath& clip_path); |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_ClipPath& clip_path); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_GraphState& graph_state); |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_GraphState& graph_state); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_TextState& text_state); |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_TextState& text_state); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_ColorState& color_state); |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_ColorState& color_state); |
+ friend CPDF_PageArchiveLoader& operator>>(CPDF_PageArchiveLoader& ar, |
+ CPDF_GeneralState& general_state); |
- friend CPDF_PageArchiveLoader& operator >> (CPDF_PageArchiveLoader& ar, CPDF_GeneralState& general_state); |
+ protected: |
+ void PostProcColor(CPDF_Color& color); |
-protected: |
- void PostProcColor(CPDF_Color& color); |
+ CPDF_Object* AddResource(CPDF_Object* pSrcObj, FX_LPCSTR type); |
- CPDF_Object* AddResource(CPDF_Object* pSrcObj, FX_LPCSTR type); |
+ CPDF_ClipPath m_LastClipPath; |
- CPDF_ClipPath m_LastClipPath; |
+ CPDF_GraphState m_LastGraphState; |
- CPDF_GraphState m_LastGraphState; |
+ CPDF_ColorState m_LastColorState; |
- CPDF_ColorState m_LastColorState; |
+ CPDF_TextState m_LastTextState; |
- CPDF_TextState m_LastTextState; |
+ CPDF_GeneralState m_LastGeneralState; |
- CPDF_GeneralState m_LastGeneralState; |
+ CPDF_PageObjects* m_pCurPage; |
- CPDF_PageObjects* m_pCurPage; |
- |
- CFX_MapPtrToPtr m_ObjectMap; |
+ CFX_MapPtrToPtr m_ObjectMap; |
}; |
-#define FPDFCREATE_INCREMENTAL 1 |
-#define FPDFCREATE_NO_ORIGINAL 2 |
-#define FPDFCREATE_PROGRESSIVE 4 |
-#define FPDFCREATE_OBJECTSTREAM 8 |
-class CPDF_Creator : public CFX_Object |
-{ |
-public: |
- |
- CPDF_Creator(CPDF_Document* pDoc); |
+#define FPDFCREATE_INCREMENTAL 1 |
+#define FPDFCREATE_NO_ORIGINAL 2 |
+#define FPDFCREATE_PROGRESSIVE 4 |
+#define FPDFCREATE_OBJECTSTREAM 8 |
+class CPDF_Creator : public CFX_Object { |
+ public: |
+ CPDF_Creator(CPDF_Document* pDoc); |
- ~CPDF_Creator(); |
+ ~CPDF_Creator(); |
- void RemoveSecurity(); |
+ void RemoveSecurity(); |
- FX_BOOL Create(FX_LPCWSTR filename, FX_DWORD flags = 0); |
+ FX_BOOL Create(FX_LPCWSTR filename, FX_DWORD flags = 0); |
- FX_BOOL Create(FX_LPCSTR filename, FX_DWORD flags = 0); |
+ FX_BOOL Create(FX_LPCSTR filename, FX_DWORD flags = 0); |
- FX_BOOL Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0); |
+ FX_BOOL Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0); |
- FX_INT32 Continue(IFX_Pause *pPause = NULL); |
+ FX_INT32 Continue(IFX_Pause* pPause = NULL); |
- FX_BOOL SetFileVersion(FX_INT32 fileVersion = 17); |
-protected: |
+ FX_BOOL SetFileVersion(FX_INT32 fileVersion = 17); |
- CPDF_Document* m_pDocument; |
+ protected: |
+ CPDF_Document* m_pDocument; |
- CPDF_Parser* m_pParser; |
+ CPDF_Parser* m_pParser; |
- FX_BOOL m_bCompress; |
+ FX_BOOL m_bCompress; |
- FX_BOOL m_bSecurityChanged; |
+ FX_BOOL m_bSecurityChanged; |
- CPDF_Dictionary* m_pEncryptDict; |
- FX_DWORD m_dwEnryptObjNum; |
- FX_BOOL m_bEncryptCloned; |
+ CPDF_Dictionary* m_pEncryptDict; |
+ FX_DWORD m_dwEnryptObjNum; |
+ FX_BOOL m_bEncryptCloned; |
- FX_BOOL m_bStandardSecurity; |
+ FX_BOOL m_bStandardSecurity; |
- CPDF_CryptoHandler* m_pCryptoHandler; |
- FX_BOOL m_bNewCrypto; |
+ CPDF_CryptoHandler* m_pCryptoHandler; |
+ FX_BOOL m_bNewCrypto; |
- FX_BOOL m_bEncryptMetadata; |
+ FX_BOOL m_bEncryptMetadata; |
- CPDF_Object* m_pMetadata; |
+ CPDF_Object* m_pMetadata; |
- CPDF_XRefStream* m_pXRefStream; |
+ CPDF_XRefStream* m_pXRefStream; |
- FX_INT32 m_ObjectStreamSize; |
+ FX_INT32 m_ObjectStreamSize; |
- FX_DWORD m_dwLastObjNum; |
- FX_BOOL Create(FX_DWORD flags); |
- void ResetStandardSecurity(); |
- void Clear(); |
- FX_INT32 WriteDoc_Stage1(IFX_Pause *pPause); |
- FX_INT32 WriteDoc_Stage2(IFX_Pause *pPause); |
- FX_INT32 WriteDoc_Stage3(IFX_Pause *pPause); |
- FX_INT32 WriteDoc_Stage4(IFX_Pause *pPause); |
+ FX_DWORD m_dwLastObjNum; |
+ FX_BOOL Create(FX_DWORD flags); |
+ void ResetStandardSecurity(); |
+ void Clear(); |
+ FX_INT32 WriteDoc_Stage1(IFX_Pause* pPause); |
+ FX_INT32 WriteDoc_Stage2(IFX_Pause* pPause); |
+ FX_INT32 WriteDoc_Stage3(IFX_Pause* pPause); |
+ FX_INT32 WriteDoc_Stage4(IFX_Pause* pPause); |
- CFX_FileBufferArchive m_File; |
+ CFX_FileBufferArchive m_File; |
- FX_FILESIZE m_Offset; |
- void InitOldObjNumOffsets(); |
- void InitNewObjNumOffsets(); |
- void AppendNewObjNum(FX_DWORD objbum); |
- FX_INT32 WriteOldIndirectObject(FX_DWORD objnum); |
- FX_INT32 WriteOldObjs(IFX_Pause *pPause); |
- FX_INT32 WriteNewObjs(FX_BOOL bIncremental, IFX_Pause *pPause); |
- FX_INT32 WriteIndirectObj(const CPDF_Object* pObj); |
- FX_INT32 WriteDirectObj(FX_DWORD objnum, const CPDF_Object* pObj, FX_BOOL bEncrypt = TRUE); |
- FX_INT32 WriteIndirectObjectToStream(const CPDF_Object* pObj); |
- FX_INT32 WriteIndirectObj(FX_DWORD objnum, const CPDF_Object* pObj); |
- FX_INT32 WriteIndirectObjectToStream(FX_DWORD objnum, FX_LPCBYTE pBuffer, FX_DWORD dwSize); |
- FX_INT32 AppendObjectNumberToXRef(FX_DWORD objnum); |
- void InitID(FX_BOOL bDefault = TRUE); |
- FX_INT32 WriteStream(const CPDF_Object* pStream, FX_DWORD objnum, CPDF_CryptoHandler* pCrypto); |
+ FX_FILESIZE m_Offset; |
+ void InitOldObjNumOffsets(); |
+ void InitNewObjNumOffsets(); |
+ void AppendNewObjNum(FX_DWORD objbum); |
+ FX_INT32 WriteOldIndirectObject(FX_DWORD objnum); |
+ FX_INT32 WriteOldObjs(IFX_Pause* pPause); |
+ FX_INT32 WriteNewObjs(FX_BOOL bIncremental, IFX_Pause* pPause); |
+ FX_INT32 WriteIndirectObj(const CPDF_Object* pObj); |
+ FX_INT32 WriteDirectObj(FX_DWORD objnum, |
+ const CPDF_Object* pObj, |
+ FX_BOOL bEncrypt = TRUE); |
+ FX_INT32 WriteIndirectObjectToStream(const CPDF_Object* pObj); |
+ FX_INT32 WriteIndirectObj(FX_DWORD objnum, const CPDF_Object* pObj); |
+ FX_INT32 WriteIndirectObjectToStream(FX_DWORD objnum, |
+ FX_LPCBYTE pBuffer, |
+ FX_DWORD dwSize); |
+ FX_INT32 AppendObjectNumberToXRef(FX_DWORD objnum); |
+ void InitID(FX_BOOL bDefault = TRUE); |
+ FX_INT32 WriteStream(const CPDF_Object* pStream, |
+ FX_DWORD objnum, |
+ CPDF_CryptoHandler* pCrypto); |
- FX_INT32 m_iStage; |
- FX_DWORD m_dwFlags; |
- FX_POSITION m_Pos; |
- FX_FILESIZE m_XrefStart; |
+ FX_INT32 m_iStage; |
+ FX_DWORD m_dwFlags; |
+ FX_POSITION m_Pos; |
+ FX_FILESIZE m_XrefStart; |
- CFX_FileSizeListArray m_ObjectOffset; |
+ CFX_FileSizeListArray m_ObjectOffset; |
- CFX_DWordListArray m_ObjectSize; |
- CFX_DWordArray m_NewObjNumArray; |
+ CFX_DWordListArray m_ObjectSize; |
+ CFX_DWordArray m_NewObjNumArray; |
- CPDF_Array* m_pIDArray; |
+ CPDF_Array* m_pIDArray; |
- FX_INT32 m_FileVersion; |
- friend class CPDF_ObjectStream; |
- friend class CPDF_XRefStream; |
+ FX_INT32 m_FileVersion; |
+ friend class CPDF_ObjectStream; |
+ friend class CPDF_XRefStream; |
}; |
#endif |