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

Side by Side Diff: core/fpdfapi/parser/cpdf_stream_acc.cpp

Issue 2477443002: Remove FX_BOOL from core (Closed)
Patch Set: Created 4 years, 1 month 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 | « core/fpdfapi/parser/cpdf_stream_acc.h ('k') | core/fpdfapi/parser/cpdf_string.h » ('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 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 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 "core/fpdfapi/parser/cpdf_stream_acc.h" 7 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
8 8
9 #include "core/fpdfapi/parser/fpdf_parser_decode.h" 9 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
10 10
11 CPDF_StreamAcc::CPDF_StreamAcc() 11 CPDF_StreamAcc::CPDF_StreamAcc()
12 : m_pData(nullptr), 12 : m_pData(nullptr),
13 m_dwSize(0), 13 m_dwSize(0),
14 m_bNewBuf(FALSE), 14 m_bNewBuf(false),
15 m_pImageParam(nullptr), 15 m_pImageParam(nullptr),
16 m_pStream(nullptr), 16 m_pStream(nullptr),
17 m_pSrcData(nullptr) {} 17 m_pSrcData(nullptr) {}
18 18
19 void CPDF_StreamAcc::LoadAllData(const CPDF_Stream* pStream, 19 void CPDF_StreamAcc::LoadAllData(const CPDF_Stream* pStream,
20 FX_BOOL bRawAccess, 20 bool bRawAccess,
21 uint32_t estimated_size, 21 uint32_t estimated_size,
22 FX_BOOL bImageAcc) { 22 bool bImageAcc) {
23 if (!pStream) 23 if (!pStream)
24 return; 24 return;
25 25
26 m_pStream = pStream; 26 m_pStream = pStream;
27 if (pStream->IsMemoryBased() && 27 if (pStream->IsMemoryBased() &&
28 (!pStream->GetDict()->KeyExist("Filter") || bRawAccess)) { 28 (!pStream->GetDict()->KeyExist("Filter") || bRawAccess)) {
29 m_dwSize = pStream->GetRawSize(); 29 m_dwSize = pStream->GetRawSize();
30 m_pData = pStream->GetRawData(); 30 m_pData = pStream->GetRawData();
31 return; 31 return;
32 } 32 }
33 uint8_t* pSrcData; 33 uint8_t* pSrcData;
34 uint32_t dwSrcSize = pStream->GetRawSize(); 34 uint32_t dwSrcSize = pStream->GetRawSize();
35 if (dwSrcSize == 0) 35 if (dwSrcSize == 0)
36 return; 36 return;
37 37
38 if (!pStream->IsMemoryBased()) { 38 if (!pStream->IsMemoryBased()) {
39 pSrcData = m_pSrcData = FX_Alloc(uint8_t, dwSrcSize); 39 pSrcData = m_pSrcData = FX_Alloc(uint8_t, dwSrcSize);
40 if (!pStream->ReadRawData(0, pSrcData, dwSrcSize)) 40 if (!pStream->ReadRawData(0, pSrcData, dwSrcSize))
41 return; 41 return;
42 } else { 42 } else {
43 pSrcData = pStream->GetRawData(); 43 pSrcData = pStream->GetRawData();
44 } 44 }
45 if (!pStream->GetDict()->KeyExist("Filter") || bRawAccess) { 45 if (!pStream->GetDict()->KeyExist("Filter") || bRawAccess) {
46 m_pData = pSrcData; 46 m_pData = pSrcData;
47 m_dwSize = dwSrcSize; 47 m_dwSize = dwSrcSize;
48 } else { 48 } else {
49 FX_BOOL bRet = PDF_DataDecode(pSrcData, dwSrcSize, m_pStream->GetDict(), 49 bool bRet = PDF_DataDecode(pSrcData, dwSrcSize, m_pStream->GetDict(),
50 m_pData, m_dwSize, m_ImageDecoder, 50 m_pData, m_dwSize, m_ImageDecoder, m_pImageParam,
51 m_pImageParam, estimated_size, bImageAcc); 51 estimated_size, bImageAcc);
52 if (!bRet) { 52 if (!bRet) {
53 m_pData = pSrcData; 53 m_pData = pSrcData;
54 m_dwSize = dwSrcSize; 54 m_dwSize = dwSrcSize;
55 } 55 }
56 } 56 }
57 if (pSrcData != pStream->GetRawData() && pSrcData != m_pData) 57 if (pSrcData != pStream->GetRawData() && pSrcData != m_pData)
58 FX_Free(pSrcData); 58 FX_Free(pSrcData);
59 m_pSrcData = nullptr; 59 m_pSrcData = nullptr;
60 m_bNewBuf = m_pData != pStream->GetRawData(); 60 m_bNewBuf = m_pData != pStream->GetRawData();
61 } 61 }
(...skipping 20 matching lines...) Expand all
82 if (m_bNewBuf) { 82 if (m_bNewBuf) {
83 uint8_t* p = m_pData; 83 uint8_t* p = m_pData;
84 m_pData = nullptr; 84 m_pData = nullptr;
85 m_dwSize = 0; 85 m_dwSize = 0;
86 return p; 86 return p;
87 } 87 }
88 uint8_t* p = FX_Alloc(uint8_t, m_dwSize); 88 uint8_t* p = FX_Alloc(uint8_t, m_dwSize);
89 FXSYS_memcpy(p, m_pData, m_dwSize); 89 FXSYS_memcpy(p, m_pData, m_dwSize);
90 return p; 90 return p;
91 } 91 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_stream_acc.h ('k') | core/fpdfapi/parser/cpdf_string.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698