diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:57:45 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:57:45 -0800 |
| commit | 9ba6a147311eacb933c175168de6d11c439985d3 (patch) | |
| tree | a1a75ac52168294f73b6eda5c65c26e4444b4c47 /core/src/fxcodec/codec | |
| parent | cd2bb30aba89a05c0bbd4d6973fa070205e3a1e8 (diff) | |
| download | pdfium-9ba6a147311eacb933c175168de6d11c439985d3.tar.xz | |
Merge to XFA: Start using allowed C++11 features.
TBR=dml@google.com, thakis@chromium.org
Review URL: https://codereview.chromium.org/1544923002 .
Review URL: https://codereview.chromium.org/1545823002 .
(cherry picked from commit ba2586d2c0a50df14aa2549a0a841e1d4b9af4b6)
(cherry picked from commit 87f7d29531dabfd66e547a6be31a08272ff631d5)
Review URL: https://codereview.chromium.org/1542213002 .
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 5143f76f88..f856f43958 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -1,4 +1,3 @@ - // Copyright 2014 PDFium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +7,7 @@ #include "core/include/fxcodec/fx_codec.h" #include <cmath> +#include <utility> #include "codec_int.h" #include "core/include/fxcrt/fx_ext.h" @@ -146,7 +146,7 @@ void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height) { if (!cache->AllocateCache()) return; - m_pDataCache = nonstd::move(cache); + m_pDataCache = std::move(cache); } FX_BOOL CCodec_BasicModule::RunLengthEncode(const uint8_t* src_buf, |