diff options
author | tsepez <tsepez@chromium.org> | 2016-12-13 12:48:13 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-12-13 12:48:13 -0800 |
commit | 974b4a6c4bceb50bbe5bf316e9e273b62eaeceac (patch) | |
tree | e243d34a04905b88a11e9146e698daaa0cee2416 /core/fxcodec/codec/fx_codec_jpeg.cpp | |
parent | 988599c5d81bbb568f949454580ec6001258f806 (diff) | |
download | pdfium-974b4a6c4bceb50bbe5bf316e9e273b62eaeceac.tar.xz |
Return unique_ptr<>s from fxcodec/chromium/2951
Review-Url: https://codereview.chromium.org/2572843002
Diffstat (limited to 'core/fxcodec/codec/fx_codec_jpeg.cpp')
-rw-r--r-- | core/fxcodec/codec/fx_codec_jpeg.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index 873b52a81c..fdfdd4faeb 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -7,11 +7,13 @@ #include <setjmp.h> #include <memory> +#include <utility> #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxge/fx_dib.h" +#include "third_party/base/ptr_util.h" extern "C" { #undef FAR @@ -313,21 +315,22 @@ uint32_t CCodec_JpegDecoder::GetSrcOffset() { return (uint32_t)(m_SrcSize - src.bytes_in_buffer); } -CCodec_ScanlineDecoder* CCodec_JpegModule::CreateDecoder(const uint8_t* src_buf, - uint32_t src_size, - int width, - int height, - int nComps, - bool ColorTransform) { +std::unique_ptr<CCodec_ScanlineDecoder> CCodec_JpegModule::CreateDecoder( + const uint8_t* src_buf, + uint32_t src_size, + int width, + int height, + int nComps, + bool ColorTransform) { if (!src_buf || src_size == 0) return nullptr; - std::unique_ptr<CCodec_JpegDecoder> pDecoder(new CCodec_JpegDecoder); + auto pDecoder = pdfium::MakeUnique<CCodec_JpegDecoder>(); if (!pDecoder->Create(src_buf, src_size, width, height, nComps, ColorTransform)) { return nullptr; } - return pDecoder.release(); + return std::move(pDecoder); } bool CCodec_JpegModule::LoadInfo(const uint8_t* src_buf, |