From 05df075154a832fcb476e1dfcfb865722d0ea898 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 14 Mar 2017 14:43:42 -0400 Subject: Replace FX_FLOAT with underlying float type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56 Reviewed-on: https://pdfium-review.googlesource.com/3031 Commit-Queue: dsinclair Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña --- xfa/fde/xml/fde_xml_imp.cpp | 13 ++++++------- xfa/fde/xml/fde_xml_imp.h | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'xfa/fde/xml') diff --git a/xfa/fde/xml/fde_xml_imp.cpp b/xfa/fde/xml/fde_xml_imp.cpp index 541fd98a00..0959661b26 100644 --- a/xfa/fde/xml/fde_xml_imp.cpp +++ b/xfa/fde/xml/fde_xml_imp.cpp @@ -618,8 +618,8 @@ void CFDE_XMLInstruction::SetInteger(const wchar_t* pwsAttriName, SetString(pwsAttriName, wsValue); } -FX_FLOAT CFDE_XMLInstruction::GetFloat(const wchar_t* pwsAttriName, - FX_FLOAT fDefValue) const { +float CFDE_XMLInstruction::GetFloat(const wchar_t* pwsAttriName, + float fDefValue) const { int32_t iCount = pdfium::CollectionSize(m_Attributes); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { @@ -630,7 +630,7 @@ FX_FLOAT CFDE_XMLInstruction::GetFloat(const wchar_t* pwsAttriName, } void CFDE_XMLInstruction::SetFloat(const wchar_t* pwsAttriName, - FX_FLOAT fAttriValue) { + float fAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%f", fAttriValue); SetString(pwsAttriName, wsValue); @@ -829,8 +829,8 @@ void CFDE_XMLElement::SetInteger(const wchar_t* pwsAttriName, SetString(pwsAttriName, wsValue); } -FX_FLOAT CFDE_XMLElement::GetFloat(const wchar_t* pwsAttriName, - FX_FLOAT fDefValue) const { +float CFDE_XMLElement::GetFloat(const wchar_t* pwsAttriName, + float fDefValue) const { int32_t iCount = pdfium::CollectionSize(m_Attributes); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { @@ -840,8 +840,7 @@ FX_FLOAT CFDE_XMLElement::GetFloat(const wchar_t* pwsAttriName, return fDefValue; } -void CFDE_XMLElement::SetFloat(const wchar_t* pwsAttriName, - FX_FLOAT fAttriValue) { +void CFDE_XMLElement::SetFloat(const wchar_t* pwsAttriName, float fAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%f", fAttriValue); SetString(pwsAttriName, wsValue); diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h index 7ae05a4936..ab5ab9be24 100644 --- a/xfa/fde/xml/fde_xml_imp.h +++ b/xfa/fde/xml/fde_xml_imp.h @@ -95,8 +95,8 @@ class CFDE_XMLInstruction : public CFDE_XMLNode { const CFX_WideString& wsAttriValue); int32_t GetInteger(const wchar_t* pwsAttriName, int32_t iDefValue = 0) const; void SetInteger(const wchar_t* pwsAttriName, int32_t iAttriValue); - FX_FLOAT GetFloat(const wchar_t* pwsAttriName, FX_FLOAT fDefValue = 0) const; - void SetFloat(const wchar_t* pwsAttriName, FX_FLOAT fAttriValue); + float GetFloat(const wchar_t* pwsAttriName, float fDefValue = 0) const; + void SetFloat(const wchar_t* pwsAttriName, float fAttriValue); void RemoveAttribute(const wchar_t* pwsAttriName); int32_t CountData() const; bool GetData(int32_t index, CFX_WideString& wsData) const; @@ -139,8 +139,8 @@ class CFDE_XMLElement : public CFDE_XMLNode { int32_t GetInteger(const wchar_t* pwsAttriName, int32_t iDefValue = 0) const; void SetInteger(const wchar_t* pwsAttriName, int32_t iAttriValue); - FX_FLOAT GetFloat(const wchar_t* pwsAttriName, FX_FLOAT fDefValue = 0) const; - void SetFloat(const wchar_t* pwsAttriName, FX_FLOAT fAttriValue); + float GetFloat(const wchar_t* pwsAttriName, float fDefValue = 0) const; + void SetFloat(const wchar_t* pwsAttriName, float fAttriValue); void GetTextData(CFX_WideString& wsText) const; void SetTextData(const CFX_WideString& wsText); -- cgit v1.2.3