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

Side by Side Diff: core/src/fxcrt/fx_basic_buffer.cpp

Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: remove cast change on security_handler file Created 4 years, 9 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 | « core/src/fpdfdoc/doc_formfield.cpp ('k') | core/src/fxcrt/fx_basic_wstring.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 <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "core/include/fxcrt/fx_basic.h" 10 #include "core/include/fxcrt/fx_basic.h"
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 m_pFile = nullptr; 374 m_pFile = nullptr;
375 } 375 }
376 376
377 bool CFX_FileBufferArchive::Flush() { 377 bool CFX_FileBufferArchive::Flush() {
378 size_t nRemaining = m_Length; 378 size_t nRemaining = m_Length;
379 m_Length = 0; 379 m_Length = 0;
380 if (!m_pFile) 380 if (!m_pFile)
381 return false; 381 return false;
382 if (!m_pBuffer || !nRemaining) 382 if (!m_pBuffer || !nRemaining)
383 return true; 383 return true;
384 return m_pFile->WriteBlock(m_pBuffer.get(), nRemaining); 384 return m_pFile->WriteBlock(m_pBuffer.get(), nRemaining) > 0;
385 } 385 }
386 386
387 int32_t CFX_FileBufferArchive::AppendBlock(const void* pBuf, size_t size) { 387 int32_t CFX_FileBufferArchive::AppendBlock(const void* pBuf, size_t size) {
388 if (!pBuf || size < 1) { 388 if (!pBuf || size < 1) {
389 return 0; 389 return 0;
390 } 390 }
391 if (!m_pBuffer) { 391 if (!m_pBuffer) {
392 m_pBuffer.reset(FX_Alloc(uint8_t, kBufSize)); 392 m_pBuffer.reset(FX_Alloc(uint8_t, kBufSize));
393 } 393 }
394 const uint8_t* buffer = reinterpret_cast<const uint8_t*>(pBuf); 394 const uint8_t* buffer = reinterpret_cast<const uint8_t*>(pBuf);
(...skipping 24 matching lines...) Expand all
419 } 419 }
420 420
421 int32_t CFX_FileBufferArchive::AppendString(const CFX_ByteStringC& lpsz) { 421 int32_t CFX_FileBufferArchive::AppendString(const CFX_ByteStringC& lpsz) {
422 return AppendBlock(lpsz.GetPtr(), lpsz.GetLength()); 422 return AppendBlock(lpsz.GetPtr(), lpsz.GetLength());
423 } 423 }
424 424
425 void CFX_FileBufferArchive::AttachFile(IFX_StreamWrite* pFile) { 425 void CFX_FileBufferArchive::AttachFile(IFX_StreamWrite* pFile) {
426 FXSYS_assert(pFile); 426 FXSYS_assert(pFile);
427 m_pFile = pFile; 427 m_pFile = pFile;
428 } 428 }
OLDNEW
« no previous file with comments | « core/src/fpdfdoc/doc_formfield.cpp ('k') | core/src/fxcrt/fx_basic_wstring.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698