diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 09:04:14 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 09:04:14 -0400 |
| commit | 1edb860fd465879311ec85c5c6385067b7985013 (patch) | |
| tree | b98487088122ca95966550e2c902b0e3ded66ad5 /core/src/fpdfapi | |
| parent | bbe0e4d3b57f95e93535c95298203c62d62474fe (diff) | |
| download | pdfium-1edb860fd465879311ec85c5c6385067b7985013.tar.xz | |
Merge to XFA: Remove void* ctor from CPDF_Number.
This Removes the ctor that took a pointer to the data to store and copied it
into the union memory. Instead, the call sites look at the type and pass the
correct value.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1422473002 .
(cherry picked from commit 8430a5d04883fac4666d0c321fc679bcaf99cb71)
Review URL: https://codereview.chromium.org/1417113002 .
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 6 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp index ffa5e62a07..1283a3a596 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -163,8 +163,10 @@ CPDF_Object* CPDF_StreamContentParser::GetObject(FX_DWORD index) { } _ContentParam& param = m_ParamBuf1[real_index]; if (param.m_Type == PDFOBJ_NUMBER) { - CPDF_Number* pNumber = CPDF_Number::Create(param.m_Number.m_bInteger, - ¶m.m_Number.m_Integer); + CPDF_Number* pNumber = param.m_Number.m_bInteger + ? CPDF_Number::Create(param.m_Number.m_Integer) + : CPDF_Number::Create(param.m_Number.m_Float); + param.m_Type = 0; param.m_pObject = pNumber; return pNumber; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index 8afa011585..db7ffe3f12 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -247,8 +247,9 @@ CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect, case PDFOBJ_BOOLEAN: return new CPDF_Boolean(this->AsBoolean()->m_bValue); case PDFOBJ_NUMBER: - return new CPDF_Number(((CPDF_Number*)this)->m_bInteger, - &((CPDF_Number*)this)->m_Integer); + if (((CPDF_Number*)this)->m_bInteger) + return new CPDF_Number(((CPDF_Number*)this)->m_Integer); + return new CPDF_Number(((CPDF_Number*)this)->m_Float); case PDFOBJ_STRING: return new CPDF_String(((CPDF_String*)this)->m_String, ((CPDF_String*)this)->IsHex()); @@ -359,11 +360,6 @@ CPDF_Number::CPDF_Number(int value) CPDF_Number::CPDF_Number(FX_FLOAT value) : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(FALSE), m_Float(value) {} -CPDF_Number::CPDF_Number(FX_BOOL bInteger, void* pData) - : CPDF_Object(PDFOBJ_NUMBER), - m_bInteger(bInteger), - m_Integer(*(int*)pData) {} - CPDF_Number::CPDF_Number(const CFX_ByteStringC& str) : CPDF_Object(PDFOBJ_NUMBER) { FX_atonum(str, m_bInteger, &m_Integer); |