Remove CPDF_Array::GetFloatAt().
It is just an alias for GetNumberAt().
Change-Id: I2bf6b50c6ee56322fba32b1257a3e982aedaf8ea
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/54890
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_expintfunc.cpp b/core/fpdfapi/page/cpdf_expintfunc.cpp
index 668f1ac..7194f97 100644
--- a/core/fpdfapi/page/cpdf_expintfunc.cpp
+++ b/core/fpdfapi/page/cpdf_expintfunc.cpp
@@ -39,8 +39,8 @@
m_BeginValues = pdfium::Vector2D<float>(m_nOutputs, 2);
m_EndValues = pdfium::Vector2D<float>(m_nOutputs, 2);
for (uint32_t i = 0; i < m_nOutputs; i++) {
- m_BeginValues[i] = pArray0 ? pArray0->GetFloatAt(i) : 0.0f;
- m_EndValues[i] = pArray1 ? pArray1->GetFloatAt(i) : 1.0f;
+ m_BeginValues[i] = pArray0 ? pArray0->GetNumberAt(i) : 0.0f;
+ m_EndValues[i] = pArray1 ? pArray1->GetNumberAt(i) : 1.0f;
}
FX_SAFE_UINT32 nOutputs = m_nOutputs;
diff --git a/core/fpdfapi/page/cpdf_function.cpp b/core/fpdfapi/page/cpdf_function.cpp
index 9694794..d6bde12 100644
--- a/core/fpdfapi/page/cpdf_function.cpp
+++ b/core/fpdfapi/page/cpdf_function.cpp
@@ -94,7 +94,7 @@
size_t nInputs = m_nInputs * 2;
m_Domains = std::vector<float>(nInputs);
for (size_t i = 0; i < nInputs; ++i)
- m_Domains[i] = pDomains->GetFloatAt(i);
+ m_Domains[i] = pDomains->GetNumberAt(i);
const CPDF_Array* pRanges = pDict->GetArrayFor("Range");
m_nOutputs = pRanges ? pRanges->size() / 2 : 0;
@@ -110,7 +110,7 @@
size_t nOutputs = m_nOutputs * 2;
m_Ranges = std::vector<float>(nOutputs);
for (size_t i = 0; i < nOutputs; ++i)
- m_Ranges[i] = pRanges->GetFloatAt(i);
+ m_Ranges[i] = pRanges->GetNumberAt(i);
}
uint32_t old_outputs = m_nOutputs;
diff --git a/core/fpdfapi/page/cpdf_sampledfunc.cpp b/core/fpdfapi/page/cpdf_sampledfunc.cpp
index 45d21ae..c80e16c 100644
--- a/core/fpdfapi/page/cpdf_sampledfunc.cpp
+++ b/core/fpdfapi/page/cpdf_sampledfunc.cpp
@@ -67,8 +67,8 @@
m_EncodeInfo[i].sizes = size;
nTotalSampleBits *= m_EncodeInfo[i].sizes;
if (pEncode) {
- m_EncodeInfo[i].encode_min = pEncode->GetFloatAt(i * 2);
- m_EncodeInfo[i].encode_max = pEncode->GetFloatAt(i * 2 + 1);
+ m_EncodeInfo[i].encode_min = pEncode->GetNumberAt(i * 2);
+ m_EncodeInfo[i].encode_max = pEncode->GetNumberAt(i * 2 + 1);
} else {
m_EncodeInfo[i].encode_min = 0;
m_EncodeInfo[i].encode_max =
@@ -89,8 +89,8 @@
m_DecodeInfo.resize(m_nOutputs);
for (uint32_t i = 0; i < m_nOutputs; i++) {
if (pDecode) {
- m_DecodeInfo[i].decode_min = pDecode->GetFloatAt(2 * i);
- m_DecodeInfo[i].decode_max = pDecode->GetFloatAt(2 * i + 1);
+ m_DecodeInfo[i].decode_min = pDecode->GetNumberAt(2 * i);
+ m_DecodeInfo[i].decode_max = pDecode->GetNumberAt(2 * i + 1);
} else {
m_DecodeInfo[i].decode_min = m_Ranges[i * 2];
m_DecodeInfo[i].decode_max = m_Ranges[i * 2 + 1];
diff --git a/core/fpdfapi/page/cpdf_stitchfunc.cpp b/core/fpdfapi/page/cpdf_stitchfunc.cpp
index b3d93ac..95d920e 100644
--- a/core/fpdfapi/page/cpdf_stitchfunc.cpp
+++ b/core/fpdfapi/page/cpdf_stitchfunc.cpp
@@ -98,12 +98,12 @@
m_bounds.reserve(nSubs + 1);
m_bounds.push_back(m_Domains[0]);
for (uint32_t i = 0; i < nSubs - 1; i++)
- m_bounds.push_back(pBoundsArray->GetFloatAt(i));
+ m_bounds.push_back(pBoundsArray->GetNumberAt(i));
m_bounds.push_back(m_Domains[1]);
m_encode.reserve(nSubs * 2);
for (uint32_t i = 0; i < nSubs * 2; i++)
- m_encode.push_back(pEncodeArray->GetFloatAt(i));
+ m_encode.push_back(pEncodeArray->GetNumberAt(i));
return true;
}
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index 7922e83..450ca99 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -50,7 +50,6 @@
const CPDF_Stream* GetStreamAt(size_t index) const;
CPDF_Array* GetArrayAt(size_t index);
const CPDF_Array* GetArrayAt(size_t index) const;
- float GetFloatAt(size_t index) const { return GetNumberAt(index); }
CFX_Matrix GetMatrix() const;
CFX_FloatRect GetRect() const;
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index 584abb0..350158e 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -36,7 +36,6 @@
EXPECT_STREQ(str_val, arr->GetStringAt(index).c_str());
EXPECT_EQ(int_val, arr->GetIntegerAt(index));
EXPECT_EQ(float_val, arr->GetNumberAt(index));
- EXPECT_EQ(float_val, arr->GetFloatAt(index));
EXPECT_EQ(arr_val, arr->GetArrayAt(index));
EXPECT_EQ(dict_val, arr->GetDictAt(index));
EXPECT_EQ(stream_val, arr->GetStreamAt(index));
@@ -673,7 +672,6 @@
EXPECT_STREQ(expected_str[i], arr->GetStringAt(i).c_str());
EXPECT_EQ(expected_int[i], arr->GetIntegerAt(i));
EXPECT_EQ(expected_float[i], arr->GetNumberAt(i));
- EXPECT_EQ(expected_float[i], arr->GetFloatAt(i));
if (i == 11)
EXPECT_EQ(arr_val, arr->GetArrayAt(i));
else
diff --git a/core/fpdfapi/render/cpdf_dibbase.cpp b/core/fpdfapi/render/cpdf_dibbase.cpp
index c14d05f..9ca9833 100644
--- a/core/fpdfapi/render/cpdf_dibbase.cpp
+++ b/core/fpdfapi/render/cpdf_dibbase.cpp
@@ -677,7 +677,7 @@
m_pColorSpace->CountComponents() <= m_nComponents) {
std::vector<float> colors(m_nComponents);
for (uint32_t i = 0; i < m_nComponents; i++)
- colors[i] = pMatte->GetFloatAt(i);
+ colors[i] = pMatte->GetNumberAt(i);
float R;
float G;
diff --git a/core/fxge/cfx_color.cpp b/core/fxge/cfx_color.cpp
index a19f040..da60e67 100644
--- a/core/fxge/cfx_color.cpp
+++ b/core/fxge/cfx_color.cpp
@@ -77,15 +77,16 @@
CFX_Color rt;
switch (array.size()) {
case 1:
- rt = CFX_Color(CFX_Color::kGray, array.GetFloatAt(0));
+ rt = CFX_Color(CFX_Color::kGray, array.GetNumberAt(0));
break;
case 3:
- rt = CFX_Color(CFX_Color::kRGB, array.GetFloatAt(0), array.GetFloatAt(1),
- array.GetFloatAt(2));
+ rt = CFX_Color(CFX_Color::kRGB, array.GetNumberAt(0),
+ array.GetNumberAt(1), array.GetNumberAt(2));
break;
case 4:
- rt = CFX_Color(CFX_Color::kCMYK, array.GetFloatAt(0), array.GetFloatAt(1),
- array.GetFloatAt(2), array.GetFloatAt(3));
+ rt = CFX_Color(CFX_Color::kCMYK, array.GetNumberAt(0),
+ array.GetNumberAt(1), array.GetNumberAt(2),
+ array.GetNumberAt(3));
break;
}
return rt;
diff --git a/fpdfsdk/cpdfsdk_actionhandler.cpp b/fpdfsdk/cpdfsdk_actionhandler.cpp
index e543e85..8d52d87 100644
--- a/fpdfsdk/cpdfsdk_actionhandler.cpp
+++ b/fpdfsdk/cpdfsdk_actionhandler.cpp
@@ -375,7 +375,7 @@
std::vector<float> posArray;
if (pMyArray) {
for (size_t i = 2; i < pMyArray->size(); i++)
- posArray.push_back(pMyArray->GetFloatAt(i));
+ posArray.push_back(pMyArray->GetNumberAt(i));
}
pFormFillEnv->DoGoToAction(nPageIndex, nFitType, posArray.data(),
posArray.size());
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index 80101ae..8336665 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -50,10 +50,10 @@
if (!pArray)
return false;
- *left = pArray->GetFloatAt(0);
- *bottom = pArray->GetFloatAt(1);
- *right = pArray->GetFloatAt(2);
- *top = pArray->GetFloatAt(3);
+ *left = pArray->GetNumberAt(0);
+ *bottom = pArray->GetNumberAt(1);
+ *right = pArray->GetNumberAt(2);
+ *top = pArray->GetNumberAt(3);
return true;
}
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 423849f..b0faab1 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -1448,7 +1448,7 @@
std::vector<float> scrollPositionArray;
if (arrayObject) {
for (size_t i = 2; i < arrayObject->size(); i++)
- scrollPositionArray.push_back(arrayObject->GetFloatAt(i));
+ scrollPositionArray.push_back(arrayObject->GetNumberAt(i));
}
pRuntime->BeginBlock();
m_pFormFillEnv->DoGoToAction(dest.GetDestPageIndex(pDocument),
