From aa7022833db1a6e21b81fcca30b45ba652298f32 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 10 May 2017 13:54:54 -0400 Subject: Cleaning up Edit code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl conslidates if statements, converts int returns to bools where possible and various other cleanups in fpdfapi/edit. Change-Id: Ia31ecc69843117eb5ebfff449a6046a267d08e89 Reviewed-on: https://pdfium-review.googlesource.com/5190 Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- core/fpdfapi/edit/cpdf_creator.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'core/fpdfapi/edit/cpdf_creator.h') diff --git a/core/fpdfapi/edit/cpdf_creator.h b/core/fpdfapi/edit/cpdf_creator.h index bda6507f21..5f39f5c40f 100644 --- a/core/fpdfapi/edit/cpdf_creator.h +++ b/core/fpdfapi/edit/cpdf_creator.h @@ -58,6 +58,10 @@ class CPDF_Creator { m_ObjectOffsets[objnum] = offset; } bool IsIncremental() const { return !!(m_dwFlags & FPDFCREATE_INCREMENTAL); } + bool IsOriginal() const { return !(m_dwFlags & FPDFCREATE_NO_ORIGINAL); } + bool HasObjectStream() const { + return !!(m_dwFlags & FPDFCREATE_OBJECTSTREAM); + } private: void Clear(); @@ -66,29 +70,26 @@ class CPDF_Creator { void InitNewObjNumOffsets(); void InitID(); - int32_t AppendObjectNumberToXRef(uint32_t objnum); + bool AppendObjectNumberToXRef(uint32_t objnum); int32_t WriteDoc_Stage1(); int32_t WriteDoc_Stage2(); int32_t WriteDoc_Stage3(); int32_t WriteDoc_Stage4(); - int32_t WriteOldIndirectObject(uint32_t objnum); - int32_t WriteOldObjs(); - int32_t WriteNewObjs(); - int32_t WriteIndirectObj(const CPDF_Object* pObj); - int32_t WriteDirectObj(uint32_t objnum, - const CPDF_Object* pObj, - bool bEncrypt); - int32_t WriteIndirectObjectToStream(const CPDF_Object* pObj); - int32_t WriteIndirectObj(uint32_t objnum, const CPDF_Object* pObj); - int32_t WriteIndirectObjectToStream(uint32_t objnum, - const uint8_t* pBuffer, - uint32_t dwSize); - - int32_t WriteStream(const CPDF_Object* pStream, - uint32_t objnum, - CPDF_CryptoHandler* pCrypto); + bool WriteOldIndirectObject(uint32_t objnum); + bool WriteOldObjs(); + bool WriteNewObjs(); + bool WriteIndirectObj(const CPDF_Object* pObj); + bool WriteDirectObj(uint32_t objnum, const CPDF_Object* pObj, bool bEncrypt); + bool WriteIndirectObj(uint32_t objnum, const CPDF_Object* pObj); + bool WriteIndirectObjectToStream(uint32_t objnum, + const uint8_t* pBuffer, + uint32_t dwSize); + + bool WriteStream(const CPDF_Object* pStream, + uint32_t objnum, + CPDF_CryptoHandler* pCrypto); bool IsXRefNeedEnd(); -- cgit v1.2.3