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

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

Issue 1545183002: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: xfa 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 // 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 "core/include/fxcodec/fx_codec.h" 7 #include "core/include/fxcodec/fx_codec.h"
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height) { 134 void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height) {
135 dest_width = std::abs(dest_width); 135 dest_width = std::abs(dest_width);
136 dest_height = std::abs(dest_height); 136 dest_height = std::abs(dest_height);
137 v_DownScale(dest_width, dest_height); 137 v_DownScale(dest_width, dest_height);
138 138
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 std::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 = std::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,
(...skipping 326 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

Powered by Google App Engine
This is Rietveld 408576698