Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: fpdfsdk/src/fpdfsave.cpp

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual edits. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/src/fpdfppo.cpp ('k') | fpdfsdk/src/fpdftext.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../public/fpdf_edit.h" 7 #include "../../public/fpdf_edit.h"
8 #include "../../public/fpdf_save.h" 8 #include "../../public/fpdf_save.h"
9 #include "../include/fsdk_define.h" 9 #include "../include/fsdk_define.h"
10 10
11 #if _FX_OS_ == _FX_ANDROID_ 11 #if _FX_OS_ == _FX_ANDROID_
12 #include "time.h" 12 #include "time.h"
13 #else 13 #else
14 #include <ctime> 14 #include <ctime>
15 #endif 15 #endif
16 16
17 class CFX_IFileWrite final : public IFX_StreamWrite 17 class CFX_IFileWrite final : public IFX_StreamWrite
18 { 18 {
19 19
20 public: 20 public:
21 CFX_IFileWrite(); 21 CFX_IFileWrite();
22 » FX_BOOL»» » » Init( FPDF_FILEWRITE * pFileWriteStruct ); 22 » bool» » » » Init( FPDF_FILEWRITE * pFileWriteStruct );
23 » virtual»FX_BOOL»» WriteBlock(const void* pData, size_t size) overr ide; 23 » virtual»bool» » WriteBlock(const void* pData, size_t size) overr ide;
24 virtual void Release() override {} 24 virtual void Release() override {}
25 25
26 protected: 26 protected:
27 FPDF_FILEWRITE* m_pFileWriteStruct; 27 FPDF_FILEWRITE* m_pFileWriteStruct;
28 }; 28 };
29 29
30 CFX_IFileWrite::CFX_IFileWrite() 30 CFX_IFileWrite::CFX_IFileWrite()
31 { 31 {
32 m_pFileWriteStruct = NULL; 32 m_pFileWriteStruct = NULL;
33 } 33 }
34 34
35 FX_BOOL CFX_IFileWrite::Init( FPDF_FILEWRITE * pFileWriteStruct ) 35 bool CFX_IFileWrite::Init( FPDF_FILEWRITE * pFileWriteStruct )
36 { 36 {
37 if (!pFileWriteStruct) 37 if (!pFileWriteStruct)
38 » » return FALSE; 38 » » return false;
39 else 39 else
40 { 40 {
41 m_pFileWriteStruct = pFileWriteStruct; 41 m_pFileWriteStruct = pFileWriteStruct;
42 } 42 }
43 » return TRUE; 43 » return true;
44 } 44 }
45 45
46 FX_BOOL CFX_IFileWrite::WriteBlock(const void* pData, size_t size) 46 bool CFX_IFileWrite::WriteBlock(const void* pData, size_t size)
47 { 47 {
48 if (m_pFileWriteStruct) 48 if (m_pFileWriteStruct)
49 { 49 {
50 m_pFileWriteStruct->WriteBlock( m_pFileWriteStruct, pData, size ); 50 m_pFileWriteStruct->WriteBlock( m_pFileWriteStruct, pData, size );
51 » » return TRUE; 51 » » return true;
52 } 52 }
53 else 53 else
54 » » return FALSE; 54 » » return false;
55 } 55 }
56 56
57 FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite,FPDF _DWORD flags, FPDF_BOOL bSetVersion, 57 FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,FPDF_FILEWRITE * pFileWrite,FPDF _DWORD flags, FPDF_BOOL bSetVersion,
58 int fileVerion) 58 int fileVerion)
59 { 59 {
60 CPDF_Document* pDoc = (CPDF_Document*)document; 60 CPDF_Document* pDoc = (CPDF_Document*)document;
61 if (!pDoc) 61 if (!pDoc)
62 return 0; 62 return 0;
63 63
64 if ( flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY ) 64 if ( flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY )
65 { 65 {
66 flags = 0; 66 flags = 0;
67 } 67 }
68 68
69 CPDF_Creator FileMaker(pDoc); 69 CPDF_Creator FileMaker(pDoc);
70 if(bSetVersion) 70 if(bSetVersion)
71 FileMaker.SetFileVersion(fileVerion); 71 FileMaker.SetFileVersion(fileVerion);
72 if(flags == FPDF_REMOVE_SECURITY) 72 if(flags == FPDF_REMOVE_SECURITY)
73 { 73 {
74 flags = 0; 74 flags = 0;
75 FileMaker.RemoveSecurity(); 75 FileMaker.RemoveSecurity();
76 } 76 }
77 CFX_IFileWrite* pStreamWrite = NULL; 77 CFX_IFileWrite* pStreamWrite = NULL;
78 » FX_BOOL bRet; 78 » bool bRet;
79 pStreamWrite = new CFX_IFileWrite; 79 pStreamWrite = new CFX_IFileWrite;
80 pStreamWrite->Init( pFileWrite ); 80 pStreamWrite->Init( pFileWrite );
81 bRet = FileMaker.Create(pStreamWrite, flags); 81 bRet = FileMaker.Create(pStreamWrite, flags);
82 delete pStreamWrite; 82 delete pStreamWrite;
83 return bRet; 83 return bRet;
84 } 84 }
85 85
86 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveAsCopy( FPDF_DOCUMENT document,FPDF_FILE WRITE * pFileWrite, 86 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveAsCopy( FPDF_DOCUMENT document,FPDF_FILE WRITE * pFileWrite,
87 FPDF_DWORD flags ) 87 FPDF_DWORD flags )
88 { 88 {
89 » return _FPDF_Doc_Save(document, pFileWrite, flags, FALSE , 0); 89 » return _FPDF_Doc_Save(document, pFileWrite, flags, false , 0);
90 } 90 }
91 91
92 92
93 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion( FPDF_DOCUMENT document,F PDF_FILEWRITE * pFileWrite, 93 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion( FPDF_DOCUMENT document,F PDF_FILEWRITE * pFileWrite,
94 FPDF_DWORD flags, int fileVersion) 94 FPDF_DWORD flags, int fileVersion)
95 { 95 {
96 » return _FPDF_Doc_Save(document, pFileWrite, flags, TRUE , fileVersion); 96 » return _FPDF_Doc_Save(document, pFileWrite, flags, true , fileVersion);
97 } 97 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/fpdfppo.cpp ('k') | fpdfsdk/src/fpdftext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698