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 . --- fpdfsdk/src/fpdfsave.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'fpdfsdk/src/fpdfsave.cpp') diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index ddd6f6e90e..8e5e476ca2 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -19,8 +19,8 @@ class CFX_IFileWrite final : public IFX_StreamWrite public: CFX_IFileWrite(); - FX_BOOL Init( FPDF_FILEWRITE * pFileWriteStruct ); - virtual FX_BOOL WriteBlock(const void* pData, size_t size) override; + bool Init( FPDF_FILEWRITE * pFileWriteStruct ); + virtual bool WriteBlock(const void* pData, size_t size) override; virtual void Release() override {} protected: @@ -32,22 +32,22 @@ CFX_IFileWrite::CFX_IFileWrite() m_pFileWriteStruct = NULL; } -FX_BOOL CFX_IFileWrite::Init( FPDF_FILEWRITE * pFileWriteStruct ) +bool CFX_IFileWrite::Init( FPDF_FILEWRITE * pFileWriteStruct ) { if (!pFileWriteStruct) - return FALSE; + return false; m_pFileWriteStruct = pFileWriteStruct; - return TRUE; + return true; } -FX_BOOL CFX_IFileWrite::WriteBlock(const void* pData, size_t size) +bool CFX_IFileWrite::WriteBlock(const void* pData, size_t size) { if (!m_pFileWriteStruct) - return FALSE; + return false; m_pFileWriteStruct->WriteBlock( m_pFileWriteStruct, pData, size ); - return TRUE; + return true; } FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite,FPDF_DWORD flags, FPDF_BOOL bSetVersion, @@ -71,7 +71,7 @@ FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite,FPDF FileMaker.RemoveSecurity(); } CFX_IFileWrite* pStreamWrite = NULL; - FX_BOOL bRet; + bool bRet; pStreamWrite = new CFX_IFileWrite; pStreamWrite->Init( pFileWrite ); bRet = FileMaker.Create(pStreamWrite, flags); @@ -82,12 +82,12 @@ FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite,FPDF DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveAsCopy( FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite, FPDF_DWORD flags ) { - return _FPDF_Doc_Save(document, pFileWrite, flags, FALSE , 0); + return _FPDF_Doc_Save(document, pFileWrite, flags, false , 0); } DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion( FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite, FPDF_DWORD flags, int fileVersion) { - return _FPDF_Doc_Save(document, pFileWrite, flags, TRUE , fileVersion); + return _FPDF_Doc_Save(document, pFileWrite, flags, true , fileVersion); } -- cgit v1.2.3