summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_number.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/parser/cpdf_number.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_number.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/core/fpdfapi/parser/cpdf_number.cpp b/core/fpdfapi/parser/cpdf_number.cpp
index 23c2609e25..b75ce0766a 100644
--- a/core/fpdfapi/parser/cpdf_number.cpp
+++ b/core/fpdfapi/parser/cpdf_number.cpp
@@ -8,13 +8,14 @@
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/ptr_util.h"
-CPDF_Number::CPDF_Number() {}
+CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {}
-CPDF_Number::CPDF_Number(int value) : m_Number(value) {}
+CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {}
-CPDF_Number::CPDF_Number(float value) : m_Number(value) {}
+CPDF_Number::CPDF_Number(float value) : m_bInteger(false), m_Float(value) {}
-CPDF_Number::CPDF_Number(const ByteStringView& str) : m_Number(str) {}
+CPDF_Number::CPDF_Number(const ByteStringView& str)
+ : m_bInteger(FX_atonum(str, &m_Integer)) {}
CPDF_Number::~CPDF_Number() {}
@@ -23,17 +24,16 @@ CPDF_Object::Type CPDF_Number::GetType() const {
}
std::unique_ptr<CPDF_Object> CPDF_Number::Clone() const {
- return m_Number.IsInteger()
- ? pdfium::MakeUnique<CPDF_Number>(m_Number.GetSigned())
- : pdfium::MakeUnique<CPDF_Number>(m_Number.GetFloat());
+ return m_bInteger ? pdfium::MakeUnique<CPDF_Number>(m_Integer)
+ : pdfium::MakeUnique<CPDF_Number>(m_Float);
}
float CPDF_Number::GetNumber() const {
- return m_Number.GetFloat();
+ return m_bInteger ? static_cast<float>(m_Integer) : m_Float;
}
int CPDF_Number::GetInteger() const {
- return m_Number.GetSigned();
+ return m_bInteger ? m_Integer : static_cast<int>(m_Float);
}
bool CPDF_Number::IsNumber() const {
@@ -49,12 +49,12 @@ const CPDF_Number* CPDF_Number::AsNumber() const {
}
void CPDF_Number::SetString(const ByteString& str) {
- m_Number = FX_Number(str.AsStringView());
+ m_bInteger = FX_atonum(str.AsStringView(), &m_Integer);
}
ByteString CPDF_Number::GetString() const {
- return m_Number.IsInteger() ? ByteString::FormatInteger(m_Number.GetSigned())
- : ByteString::FormatFloat(m_Number.GetFloat());
+ return m_bInteger ? ByteString::FormatInteger(m_Integer)
+ : ByteString::FormatFloat(m_Float);
}
bool CPDF_Number::WriteTo(IFX_ArchiveStream* archive,