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

Side by Side Diff: core/src/fxcodec/codec/fx_codec.cpp

Issue 1542213002: Merge to XFA: Start using allowed C++11 features. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix mac/win Created 4 years, 12 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
OLDNEW
1
2 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
3 // 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
4 // found in the LICENSE file. 3 // found in the LICENSE file.
5 4
6 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
7 6
8 #include "core/include/fxcodec/fx_codec.h" 7 #include "core/include/fxcodec/fx_codec.h"
9 8
10 #include <cmath> 9 #include <cmath>
10 #include <utility>
11 11
12 #include "codec_int.h" 12 #include "codec_int.h"
13 #include "core/include/fxcrt/fx_ext.h" 13 #include "core/include/fxcrt/fx_ext.h"
14 #include "core/include/fxcrt/fx_safe_types.h" 14 #include "core/include/fxcrt/fx_safe_types.h"
15 #include "third_party/base/logging.h" 15 #include "third_party/base/logging.h"
16 16
17 CCodec_ModuleMgr::CCodec_ModuleMgr() 17 CCodec_ModuleMgr::CCodec_ModuleMgr()
18 : m_pBasicModule(new CCodec_BasicModule), 18 : m_pBasicModule(new CCodec_BasicModule),
19 m_pFaxModule(new CCodec_FaxModule), 19 m_pFaxModule(new CCodec_FaxModule),
20 m_pJpegModule(new CCodec_JpegModule), 20 m_pJpegModule(new CCodec_JpegModule),
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 if (m_pDataCache && 139 if (m_pDataCache &&
140 m_pDataCache->IsSameDimensions(m_OutputWidth, m_OutputHeight)) { 140 m_pDataCache->IsSameDimensions(m_OutputWidth, m_OutputHeight)) {
141 return; 141 return;
142 } 142 }
143 143
144 nonstd::unique_ptr<ImageDataCache> cache( 144 nonstd::unique_ptr<ImageDataCache> cache(
145 new ImageDataCache(m_OutputWidth, m_OutputHeight, m_Pitch)); 145 new ImageDataCache(m_OutputWidth, m_OutputHeight, m_Pitch));
146 if (!cache->AllocateCache()) 146 if (!cache->AllocateCache())
147 return; 147 return;
148 148
149 m_pDataCache = nonstd::move(cache); 149 m_pDataCache = std::move(cache);
150 } 150 }
151 151
152 FX_BOOL CCodec_BasicModule::RunLengthEncode(const uint8_t* src_buf, 152 FX_BOOL CCodec_BasicModule::RunLengthEncode(const uint8_t* src_buf,
153 FX_DWORD src_size, 153 FX_DWORD src_size,
154 uint8_t*& dest_buf, 154 uint8_t*& dest_buf,
155 FX_DWORD& dest_size) { 155 FX_DWORD& dest_size) {
156 return FALSE; 156 return FALSE;
157 } 157 }
158 158
159 #define EXPONENT_DETECT(ptr) \ 159 #define EXPONENT_DETECT(ptr) \
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 int nComps, 481 int nComps,
482 int bpc) { 482 int bpc) {
483 CCodec_RLScanlineDecoder* pRLScanlineDecoder = new CCodec_RLScanlineDecoder; 483 CCodec_RLScanlineDecoder* pRLScanlineDecoder = new CCodec_RLScanlineDecoder;
484 if (!pRLScanlineDecoder->Create(src_buf, src_size, width, height, nComps, 484 if (!pRLScanlineDecoder->Create(src_buf, src_size, width, height, nComps,
485 bpc)) { 485 bpc)) {
486 delete pRLScanlineDecoder; 486 delete pRLScanlineDecoder;
487 return NULL; 487 return NULL;
488 } 488 }
489 return pRLScanlineDecoder; 489 return pRLScanlineDecoder;
490 } 490 }
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp ('k') | core/src/fxcodec/jbig2/JBig2_Context.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698