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

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: rebase 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
« no previous file with comments | « core/src/fxcodec/codec/fx_codec_flate.cpp ('k') | core/src/fxcodec/jbig2/JBig2_Context.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 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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 return true; 858 return true;
859 } 859 }
860 860
861 CCodec_JpxModule::CCodec_JpxModule() {} 861 CCodec_JpxModule::CCodec_JpxModule() {}
862 CCodec_JpxModule::~CCodec_JpxModule() { 862 CCodec_JpxModule::~CCodec_JpxModule() {
863 } 863 }
864 864
865 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf, 865 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf,
866 FX_DWORD src_size, 866 FX_DWORD src_size,
867 CPDF_ColorSpace* cs) { 867 CPDF_ColorSpace* cs) {
868 nonstd::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(cs)); 868 std::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(cs));
869 return decoder->Init(src_buf, src_size) ? decoder.release() : nullptr; 869 return decoder->Init(src_buf, src_size) ? decoder.release() : nullptr;
870 } 870 }
871 871
872 void CCodec_JpxModule::GetImageInfo(CJPX_Decoder* pDecoder, 872 void CCodec_JpxModule::GetImageInfo(CJPX_Decoder* pDecoder,
873 FX_DWORD* width, 873 FX_DWORD* width,
874 FX_DWORD* height, 874 FX_DWORD* height,
875 FX_DWORD* components) { 875 FX_DWORD* components) {
876 pDecoder->GetInfo(width, height, components); 876 pDecoder->GetInfo(width, height, components);
877 } 877 }
878 878
879 bool CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder, 879 bool CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder,
880 uint8_t* dest_data, 880 uint8_t* dest_data,
881 int pitch, 881 int pitch,
882 const std::vector<uint8_t>& offsets) { 882 const std::vector<uint8_t>& offsets) {
883 return pDecoder->Decode(dest_data, pitch, offsets); 883 return pDecoder->Decode(dest_data, pitch, offsets);
884 } 884 }
885 885
886 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) { 886 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) {
887 delete pDecoder; 887 delete pDecoder;
888 } 888 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/codec/fx_codec_flate.cpp ('k') | core/src/fxcodec/jbig2/JBig2_Context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698