From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- core/src/fpdfapi/fpdf_edit/editint.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'core/src/fpdfapi/fpdf_edit/editint.h') diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h index 4aec32a49a..bc4c72aff9 100644 --- a/core/src/fpdfapi/fpdf_edit/editint.h +++ b/core/src/fpdfapi/fpdf_edit/editint.h @@ -12,7 +12,7 @@ class CPDF_ObjectStream public: CPDF_ObjectStream(); - FX_BOOL Start(); + bool Start(); int32_t CompressIndirectObject(FX_DWORD dwObjNum, const CPDF_Object *pObj); int32_t CompressIndirectObject(FX_DWORD dwObjNum, const uint8_t* pBuffer, FX_DWORD dwSize); @@ -34,15 +34,15 @@ public: CPDF_XRefStream(); - FX_BOOL Start(); + bool Start(); int32_t CompressIndirectObject(FX_DWORD dwObjNum, const CPDF_Object *pObj, CPDF_Creator *pCreator); int32_t CompressIndirectObject(FX_DWORD dwObjNum, const uint8_t* pBuffer, FX_DWORD dwSize, CPDF_Creator *pCreator); - FX_BOOL End(CPDF_Creator *pCreator, FX_BOOL bEOF = FALSE); - FX_BOOL AddObjectNumberToIndexArray(FX_DWORD objnum); - FX_BOOL EndXRefStream(CPDF_Creator* pCreator); + bool End(CPDF_Creator *pCreator, bool bEOF = false); + bool AddObjectNumberToIndexArray(FX_DWORD objnum); + bool EndXRefStream(CPDF_Creator* pCreator); CFX_DWordArray m_IndexArray; @@ -51,8 +51,8 @@ public: FX_DWORD m_dwTempObjNum; protected: - int32_t EndObjectStream(CPDF_Creator *pCreator, FX_BOOL bEOF = TRUE); - FX_BOOL GenerateXRefStream(CPDF_Creator* pCreator, FX_BOOL bEOF); + int32_t EndObjectStream(CPDF_Creator *pCreator, bool bEOF = true); + bool GenerateXRefStream(CPDF_Creator* pCreator, bool bEOF); int32_t m_iSeg; CPDF_ObjectStream m_ObjStream; CFX_ByteTextBuf m_Buffer; -- cgit v1.2.3