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

Side by Side Diff: core/fpdfapi/parser/cpdf_number.cpp

Issue 2484033002: Return unique_ptr from CPDF_Object::Clone(). (Closed)
Patch Set: std::move() it Created 4 years, 1 month 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/fpdfapi/parser/cpdf_number.h ('k') | core/fpdfapi/parser/cpdf_object.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 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 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/fpdfapi/parser/cpdf_number.h" 7 #include "core/fpdfapi/parser/cpdf_number.h"
8 #include "third_party/base/ptr_util.h"
8 9
9 CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {} 10 CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {}
10 11
11 CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {} 12 CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {}
12 13
13 CPDF_Number::CPDF_Number(FX_FLOAT value) : m_bInteger(false), m_Float(value) {} 14 CPDF_Number::CPDF_Number(FX_FLOAT value) : m_bInteger(false), m_Float(value) {}
14 15
15 CPDF_Number::CPDF_Number(const CFX_ByteStringC& str) 16 CPDF_Number::CPDF_Number(const CFX_ByteStringC& str)
16 : m_bInteger(FX_atonum(str, &m_Integer)) {} 17 : m_bInteger(FX_atonum(str, &m_Integer)) {}
17 18
18 CPDF_Number::~CPDF_Number() {} 19 CPDF_Number::~CPDF_Number() {}
19 20
20 CPDF_Object::Type CPDF_Number::GetType() const { 21 CPDF_Object::Type CPDF_Number::GetType() const {
21 return NUMBER; 22 return NUMBER;
22 } 23 }
23 24
24 CPDF_Object* CPDF_Number::Clone() const { 25 std::unique_ptr<CPDF_Object> CPDF_Number::Clone() const {
25 return m_bInteger ? new CPDF_Number(m_Integer) : new CPDF_Number(m_Float); 26 return m_bInteger ? pdfium::MakeUnique<CPDF_Number>(m_Integer)
27 : pdfium::MakeUnique<CPDF_Number>(m_Float);
26 } 28 }
27 29
28 FX_FLOAT CPDF_Number::GetNumber() const { 30 FX_FLOAT CPDF_Number::GetNumber() const {
29 return m_bInteger ? static_cast<FX_FLOAT>(m_Integer) : m_Float; 31 return m_bInteger ? static_cast<FX_FLOAT>(m_Integer) : m_Float;
30 } 32 }
31 33
32 int CPDF_Number::GetInteger() const { 34 int CPDF_Number::GetInteger() const {
33 return m_bInteger ? m_Integer : static_cast<int>(m_Float); 35 return m_bInteger ? m_Integer : static_cast<int>(m_Float);
34 } 36 }
35 37
(...skipping 10 matching lines...) Expand all
46 } 48 }
47 49
48 void CPDF_Number::SetString(const CFX_ByteString& str) { 50 void CPDF_Number::SetString(const CFX_ByteString& str) {
49 m_bInteger = FX_atonum(str.AsStringC(), &m_Integer); 51 m_bInteger = FX_atonum(str.AsStringC(), &m_Integer);
50 } 52 }
51 53
52 CFX_ByteString CPDF_Number::GetString() const { 54 CFX_ByteString CPDF_Number::GetString() const {
53 return m_bInteger ? CFX_ByteString::FormatInteger(m_Integer, FXFORMAT_SIGNED) 55 return m_bInteger ? CFX_ByteString::FormatInteger(m_Integer, FXFORMAT_SIGNED)
54 : CFX_ByteString::FormatFloat(m_Float); 56 : CFX_ByteString::FormatFloat(m_Float);
55 } 57 }
OLDNEW
« no previous file with comments | « core/fpdfapi/parser/cpdf_number.h ('k') | core/fpdfapi/parser/cpdf_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698