summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_number.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-09-13 21:40:49 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-09-13 21:40:49 +0000
commit61f1d62daa127097e4719575bd0ff652abcebad0 (patch)
treecc65e222aeaa6739972d9f0b07ca441c444eb6a1 /core/fpdfapi/parser/cpdf_number.cpp
parent725f544776a6ee96a514a91dffd39aa32ecca3e6 (diff)
downloadpdfium-61f1d62daa127097e4719575bd0ff652abcebad0.tar.xz
Reland "Introduce FX_Number class as a replacement for FX_atonum()."
This reverts commit 29e180342e18873babf1c74f7c5c056f90a191b0. Reason for revert: probably harmless Original change's description: > Revert "Introduce FX_Number class as a replacement for FX_atonum()." > > This reverts commit a5d7ad3aa8feb08a14b5cca173d673054c1ade23. > > Reason for revert: Speculative revert to get back before flake. > > Original change's description: > > Introduce FX_Number class as a replacement for FX_atonum(). > > > > The issue with FX_atonum() is that it doesn't return any information > > about whether it range-checked its integer values as a signed or > > unsigned type, even though it knows this as part of its processing. > > > > Rather than adding another out parameter to that function, create > > a class to hold all this information together. > > > > This is the first place things went astray while diagnosing > > bug 882959, in that a large positive value was cast to float as a > > negative value. Unfortunately, this doesn't affect the related bug, > > but is a step in the right direction. > > > > Change-Id: I0977ec8fccf85e2632a962507bdd30a1cbe6d33c > > Reviewed-on: https://pdfium-review.googlesource.com/42353 > > Reviewed-by: Lei Zhang <thestig@chromium.org> > > Commit-Queue: Tom Sepez <tsepez@chromium.org> > > TBR=thestig@chromium.org,tsepez@chromium.org > > Change-Id: Ia56270c3daa80408fc2b23eb4384a77f03f45b82 > Reviewed-on: https://pdfium-review.googlesource.com/42392 > Reviewed-by: Tom Sepez <tsepez@chromium.org> > Commit-Queue: Tom Sepez <tsepez@chromium.org> TBR=thestig@chromium.org,tsepez@chromium.org Change-Id: I83c37aa3040a8890f2117753f19ab1d452d411e7 Reviewed-on: https://pdfium-review.googlesource.com/42410 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
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 b75ce0766a..23c2609e25 100644
--- a/core/fpdfapi/parser/cpdf_number.cpp
+++ b/core/fpdfapi/parser/cpdf_number.cpp
@@ -8,14 +8,13 @@
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/ptr_util.h"
-CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {}
+CPDF_Number::CPDF_Number() {}
-CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {}
+CPDF_Number::CPDF_Number(int value) : m_Number(value) {}
-CPDF_Number::CPDF_Number(float value) : m_bInteger(false), m_Float(value) {}
+CPDF_Number::CPDF_Number(float value) : m_Number(value) {}
-CPDF_Number::CPDF_Number(const ByteStringView& str)
- : m_bInteger(FX_atonum(str, &m_Integer)) {}
+CPDF_Number::CPDF_Number(const ByteStringView& str) : m_Number(str) {}
CPDF_Number::~CPDF_Number() {}
@@ -24,16 +23,17 @@ CPDF_Object::Type CPDF_Number::GetType() const {
}
std::unique_ptr<CPDF_Object> CPDF_Number::Clone() const {
- return m_bInteger ? pdfium::MakeUnique<CPDF_Number>(m_Integer)
- : pdfium::MakeUnique<CPDF_Number>(m_Float);
+ return m_Number.IsInteger()
+ ? pdfium::MakeUnique<CPDF_Number>(m_Number.GetSigned())
+ : pdfium::MakeUnique<CPDF_Number>(m_Number.GetFloat());
}
float CPDF_Number::GetNumber() const {
- return m_bInteger ? static_cast<float>(m_Integer) : m_Float;
+ return m_Number.GetFloat();
}
int CPDF_Number::GetInteger() const {
- return m_bInteger ? m_Integer : static_cast<int>(m_Float);
+ return m_Number.GetSigned();
}
bool CPDF_Number::IsNumber() const {
@@ -49,12 +49,12 @@ const CPDF_Number* CPDF_Number::AsNumber() const {
}
void CPDF_Number::SetString(const ByteString& str) {
- m_bInteger = FX_atonum(str.AsStringView(), &m_Integer);
+ m_Number = FX_Number(str.AsStringView());
}
ByteString CPDF_Number::GetString() const {
- return m_bInteger ? ByteString::FormatInteger(m_Integer)
- : ByteString::FormatFloat(m_Float);
+ return m_Number.IsInteger() ? ByteString::FormatInteger(m_Number.GetSigned())
+ : ByteString::FormatFloat(m_Number.GetFloat());
}
bool CPDF_Number::WriteTo(IFX_ArchiveStream* archive,