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

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

Issue 1547833002: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 5 years 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 <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 return true; 859 return true;
860 } 860 }
861 861
862 CCodec_JpxModule::CCodec_JpxModule() {} 862 CCodec_JpxModule::CCodec_JpxModule() {}
863 CCodec_JpxModule::~CCodec_JpxModule() { 863 CCodec_JpxModule::~CCodec_JpxModule() {
864 } 864 }
865 865
866 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf, 866 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf,
867 FX_DWORD src_size, 867 FX_DWORD src_size,
868 bool use_colorspace) { 868 bool use_colorspace) {
869 nonstd::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(use_colorspace)); 869 std::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(use_colorspace));
870 return decoder->Init(src_buf, src_size) ? decoder.release() : nullptr; 870 return decoder->Init(src_buf, src_size) ? decoder.release() : nullptr;
871 } 871 }
872 872
873 void CCodec_JpxModule::GetImageInfo(CJPX_Decoder* pDecoder, 873 void CCodec_JpxModule::GetImageInfo(CJPX_Decoder* pDecoder,
874 FX_DWORD* width, 874 FX_DWORD* width,
875 FX_DWORD* height, 875 FX_DWORD* height,
876 FX_DWORD* components) { 876 FX_DWORD* components) {
877 pDecoder->GetInfo(width, height, components); 877 pDecoder->GetInfo(width, height, components);
878 } 878 }
879 879
880 bool CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder, 880 bool CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder,
881 uint8_t* dest_data, 881 uint8_t* dest_data,
882 int pitch, 882 int pitch,
883 const std::vector<uint8_t>& offsets) { 883 const std::vector<uint8_t>& offsets) {
884 return pDecoder->Decode(dest_data, pitch, offsets); 884 return pDecoder->Decode(dest_data, pitch, offsets);
885 } 885 }
886 886
887 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) { 887 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) {
888 delete pDecoder; 888 delete pDecoder;
889 } 889 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698