diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 13:36:00 -0700 |
commit | f1e7c461dfabbff6b65a072f24f6711b34159361 (patch) | |
tree | 3b0bb772a59669f06b86824a444fd06642592d4b /core/include/fpdfapi/fpdf_serial.h | |
parent | 320b2313d19869333ed453af546e61a9fc2b81c9 (diff) | |
download | pdfium-f1e7c461dfabbff6b65a072f24f6711b34159361.tar.xz |
Revert "FX_BOOL considered harmful, part 2."
This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9.
Reason for revert: build failure.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255693002 .
Diffstat (limited to 'core/include/fpdfapi/fpdf_serial.h')
-rw-r--r-- | core/include/fpdfapi/fpdf_serial.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h index 06cf213d99..1877ef8866 100644 --- a/core/include/fpdfapi/fpdf_serial.h +++ b/core/include/fpdfapi/fpdf_serial.h @@ -117,35 +117,35 @@ public: void RemoveSecurity(); - bool Create(const FX_WCHAR* filename, FX_DWORD flags = 0); + FX_BOOL Create(const FX_WCHAR* filename, FX_DWORD flags = 0); - bool Create(const FX_CHAR* filename, FX_DWORD flags = 0); + FX_BOOL Create(const FX_CHAR* filename, FX_DWORD flags = 0); - bool Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0); + FX_BOOL Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0); int32_t Continue(IFX_Pause *pPause = NULL); - bool SetFileVersion(int32_t fileVersion = 17); + FX_BOOL SetFileVersion(int32_t fileVersion = 17); protected: CPDF_Document* m_pDocument; CPDF_Parser* m_pParser; - bool m_bCompress; + FX_BOOL m_bCompress; - bool m_bSecurityChanged; + FX_BOOL m_bSecurityChanged; CPDF_Dictionary* m_pEncryptDict; FX_DWORD m_dwEnryptObjNum; - bool m_bEncryptCloned; + FX_BOOL m_bEncryptCloned; - bool m_bStandardSecurity; + FX_BOOL m_bStandardSecurity; CPDF_CryptoHandler* m_pCryptoHandler; - bool m_bNewCrypto; + FX_BOOL m_bNewCrypto; - bool m_bEncryptMetadata; + FX_BOOL m_bEncryptMetadata; CPDF_Object* m_pMetadata; @@ -154,7 +154,7 @@ protected: int32_t m_ObjectStreamSize; FX_DWORD m_dwLastObjNum; - bool Create(FX_DWORD flags); + FX_BOOL Create(FX_DWORD flags); void ResetStandardSecurity(); void Clear(); int32_t WriteDoc_Stage1(IFX_Pause *pPause); @@ -170,14 +170,14 @@ protected: void AppendNewObjNum(FX_DWORD objbum); int32_t WriteOldIndirectObject(FX_DWORD objnum); int32_t WriteOldObjs(IFX_Pause *pPause); - int32_t WriteNewObjs(bool bIncremental, IFX_Pause *pPause); + int32_t WriteNewObjs(FX_BOOL bIncremental, IFX_Pause *pPause); int32_t WriteIndirectObj(const CPDF_Object* pObj); - int32_t WriteDirectObj(FX_DWORD objnum, const CPDF_Object* pObj, bool bEncrypt = true); + int32_t WriteDirectObj(FX_DWORD objnum, const CPDF_Object* pObj, FX_BOOL bEncrypt = TRUE); int32_t WriteIndirectObjectToStream(const CPDF_Object* pObj); int32_t WriteIndirectObj(FX_DWORD objnum, const CPDF_Object* pObj); int32_t WriteIndirectObjectToStream(FX_DWORD objnum, const uint8_t* pBuffer, FX_DWORD dwSize); int32_t AppendObjectNumberToXRef(FX_DWORD objnum); - void InitID(bool bDefault = true); + void InitID(FX_BOOL bDefault = TRUE); int32_t WriteStream(const CPDF_Object* pStream, FX_DWORD objnum, CPDF_CryptoHandler* pCrypto); int32_t m_iStage; |