Rename CPDF_Array::GetNumberAt() to GetFloatAt().
Similar to https://pdfium-review.googlesource.com/c/pdfium/+/97812 but
for CPDF_Array objects.
Change-Id: I22f0e342cd3f67804b64a5344c9f88d1e8e56e93
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/97813
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index feb8b91..ea7caaf 100644
--- a/core/fpdfapi/font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -70,8 +70,8 @@
const CPDF_Array* pBBox = m_pFontDict->GetArrayFor("FontBBox");
if (pBBox) {
CFX_FloatRect box(
- pBBox->GetNumberAt(0) * xscale, pBBox->GetNumberAt(1) * yscale,
- pBBox->GetNumberAt(2) * xscale, pBBox->GetNumberAt(3) * yscale);
+ pBBox->GetFloatAt(0) * xscale, pBBox->GetFloatAt(1) * yscale,
+ pBBox->GetFloatAt(2) * xscale, pBBox->GetFloatAt(3) * yscale);
CPDF_Type3Char::TextUnitRectToGlyphUnitRect(&box);
m_FontBBox = box.ToFxRect();
}
@@ -86,7 +86,7 @@
for (size_t i = 0; i < count; i++) {
m_CharWidthL[StartChar + i] =
FXSYS_roundf(CPDF_Type3Char::TextUnitToGlyphUnit(
- pWidthArray->GetNumberAt(i) * xscale));
+ pWidthArray->GetFloatAt(i) * xscale));
}
}
}
diff --git a/core/fpdfapi/page/cpdf_allstates.cpp b/core/fpdfapi/page/cpdf_allstates.cpp
index 585da7a..37a015b 100644
--- a/core/fpdfapi/page/cpdf_allstates.cpp
+++ b/core/fpdfapi/page/cpdf_allstates.cpp
@@ -76,7 +76,7 @@
break;
// TODO(tsepez): pass moved retained object.
- SetLineDash(pArray.Get(), pDash->GetNumberAt(1), 1.0f);
+ SetLineDash(pArray.Get(), pDash->GetFloatAt(1), 1.0f);
break;
}
case FXBSTR_ID('R', 'I', 0, 0):
@@ -87,7 +87,7 @@
if (!pFont)
break;
- m_TextState.SetFontSize(pFont->GetNumberAt(1));
+ m_TextState.SetFontSize(pFont->GetFloatAt(1));
m_TextState.SetFont(pParser->FindFont(pFont->GetStringAt(0)));
break;
}
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index 0707c89..48b87d8 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -96,7 +96,7 @@
// Check to make sure all values are non-negative.
for (size_t i = 0; i < kBlackWhitePointCount; ++i) {
- pPoints[i] = pParam->GetNumberAt(i);
+ pPoints[i] = pParam->GetFloatAt(i);
if (pPoints[i] < 0) {
GetDefaultBlackPoint(pPoints);
return;
@@ -110,7 +110,7 @@
return false;
for (size_t i = 0; i < kBlackWhitePointCount; ++i)
- pPoints[i] = pParam->GetNumberAt(i);
+ pPoints[i] = pParam->GetFloatAt(i);
return pPoints[0] > 0.0f && pPoints[1] == 1.0f && pPoints[2] > 0.0f;
}
@@ -708,14 +708,14 @@
if (pParam) {
m_bHasGamma = true;
for (size_t i = 0; i < std::size(m_Gamma); ++i)
- m_Gamma[i] = pParam->GetNumberAt(i);
+ m_Gamma[i] = pParam->GetFloatAt(i);
}
pParam = pDict->GetArrayFor("Matrix");
if (pParam) {
m_bHasMatrix = true;
for (size_t i = 0; i < std::size(m_Matrix); ++i)
- m_Matrix[i] = pParam->GetNumberAt(i);
+ m_Matrix[i] = pParam->GetFloatAt(i);
}
return 3;
}
@@ -824,7 +824,7 @@
static_assert(std::size(kDefaultRanges) == std::extent<decltype(m_Ranges)>(),
"Range size mismatch");
for (size_t i = 0; i < std::size(kDefaultRanges); ++i)
- m_Ranges[i] = pParam ? pParam->GetNumberAt(i) : kDefaultRanges[i];
+ m_Ranges[i] = pParam ? pParam->GetFloatAt(i) : kDefaultRanges[i];
return 3;
}
diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index 548143f..bf57002 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp
@@ -392,8 +392,8 @@
const CPDF_Array* pDecode = m_pDict->GetArrayFor("Decode");
if (pDecode) {
for (uint32_t i = 0; i < m_nComponents; i++) {
- m_CompData[i].m_DecodeMin = pDecode->GetNumberAt(i * 2);
- float max = pDecode->GetNumberAt(i * 2 + 1);
+ m_CompData[i].m_DecodeMin = pDecode->GetFloatAt(i * 2);
+ float max = pDecode->GetFloatAt(i * 2 + 1);
m_CompData[i].m_DecodeStep = (max - m_CompData[i].m_DecodeMin) / max_data;
float def_value;
float def_min;
diff --git a/core/fpdfapi/page/cpdf_expintfunc.cpp b/core/fpdfapi/page/cpdf_expintfunc.cpp
index cde595f..c0ac4cd 100644
--- a/core/fpdfapi/page/cpdf_expintfunc.cpp
+++ b/core/fpdfapi/page/cpdf_expintfunc.cpp
@@ -41,8 +41,8 @@
m_BeginValues = fxcrt::Vector2D<float>(m_nOutputs, 2);
m_EndValues = fxcrt::Vector2D<float>(m_nOutputs, 2);
for (uint32_t i = 0; i < m_nOutputs; i++) {
- m_BeginValues[i] = pArray0 ? pArray0->GetNumberAt(i) : 0.0f;
- m_EndValues[i] = pArray1 ? pArray1->GetNumberAt(i) : 1.0f;
+ m_BeginValues[i] = pArray0 ? pArray0->GetFloatAt(i) : 0.0f;
+ m_EndValues[i] = pArray1 ? pArray1->GetFloatAt(i) : 1.0f;
}
FX_SAFE_UINT32 nOutputs = m_nOutputs;
diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp
index 7484f30..5a46f8b 100644
--- a/core/fpdfapi/page/cpdf_meshstream.cpp
+++ b/core/fpdfapi/page/cpdf_meshstream.cpp
@@ -134,13 +134,13 @@
if (!pDecode || pDecode->size() != 4 + m_nComponents * 2)
return false;
- m_xmin = pDecode->GetNumberAt(0);
- m_xmax = pDecode->GetNumberAt(1);
- m_ymin = pDecode->GetNumberAt(2);
- m_ymax = pDecode->GetNumberAt(3);
+ m_xmin = pDecode->GetFloatAt(0);
+ m_xmax = pDecode->GetFloatAt(1);
+ m_ymin = pDecode->GetFloatAt(2);
+ m_ymax = pDecode->GetFloatAt(3);
for (uint32_t i = 0; i < m_nComponents; ++i) {
- m_ColorMin[i] = pDecode->GetNumberAt(i * 2 + 4);
- m_ColorMax[i] = pDecode->GetNumberAt(i * 2 + 5);
+ m_ColorMin[i] = pDecode->GetFloatAt(i * 2 + 4);
+ m_ColorMax[i] = pDecode->GetFloatAt(i * 2 + 5);
}
if (ShouldCheckBPC(m_type)) {
diff --git a/core/fpdfapi/page/cpdf_sampledfunc.cpp b/core/fpdfapi/page/cpdf_sampledfunc.cpp
index 43d4afa..3f405c2 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->GetNumberAt(i * 2);
- m_EncodeInfo[i].encode_max = pEncode->GetNumberAt(i * 2 + 1);
+ m_EncodeInfo[i].encode_min = pEncode->GetFloatAt(i * 2);
+ m_EncodeInfo[i].encode_max = pEncode->GetFloatAt(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->GetNumberAt(2 * i);
- m_DecodeInfo[i].decode_max = pDecode->GetNumberAt(2 * i + 1);
+ m_DecodeInfo[i].decode_min = pDecode->GetFloatAt(2 * i);
+ m_DecodeInfo[i].decode_max = pDecode->GetFloatAt(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 2a3c97a..3e9b75a 100644
--- a/core/fpdfapi/page/cpdf_stitchfunc.cpp
+++ b/core/fpdfapi/page/cpdf_stitchfunc.cpp
@@ -100,7 +100,7 @@
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->GetNumberAt(i));
+ m_bounds.push_back(pBoundsArray->GetFloatAt(i));
m_bounds.push_back(m_Domains[1]);
m_encode = ReadArrayElementsToVector(pEncodeArray, nSubs * 2);
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index b6ec661..7cef6c4 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -1285,7 +1285,7 @@
}
if (nsegs == 0) {
for (size_t i = 0; i < n; i++) {
- float fKerning = pArray->GetNumberAt(i);
+ float fKerning = pArray->GetFloatAt(i);
if (fKerning != 0)
m_pCurStates->m_TextPos.x -= GetHorizontalTextSize(fKerning);
}
diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp
index ec1542c1..a2ef00c 100644
--- a/core/fpdfapi/parser/cpdf_array.cpp
+++ b/core/fpdfapi/parser/cpdf_array.cpp
@@ -66,10 +66,10 @@
if (m_Objects.size() != 4)
return rect;
- rect.left = GetNumberAt(0);
- rect.bottom = GetNumberAt(1);
- rect.right = GetNumberAt(2);
- rect.top = GetNumberAt(3);
+ rect.left = GetFloatAt(0);
+ rect.bottom = GetFloatAt(1);
+ rect.right = GetFloatAt(2);
+ rect.top = GetFloatAt(3);
return rect;
}
@@ -77,8 +77,8 @@
if (m_Objects.size() != 6)
return CFX_Matrix();
- return CFX_Matrix(GetNumberAt(0), GetNumberAt(1), GetNumberAt(2),
- GetNumberAt(3), GetNumberAt(4), GetNumberAt(5));
+ return CFX_Matrix(GetFloatAt(0), GetFloatAt(1), GetFloatAt(2), GetFloatAt(3),
+ GetFloatAt(4), GetFloatAt(5));
}
absl::optional<size_t> CPDF_Array::Find(const CPDF_Object* pThat) const {
@@ -143,7 +143,7 @@
return m_Objects[index]->GetInteger();
}
-float CPDF_Array::GetNumberAt(size_t index) const {
+float CPDF_Array::GetFloatAt(size_t index) const {
if (index >= m_Objects.size())
return 0;
return m_Objects[index]->GetNumber();
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index f974fe8..018877e 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -59,7 +59,7 @@
WideString GetUnicodeTextAt(size_t index) const;
bool GetBooleanAt(size_t index, bool bDefault) const;
int GetIntegerAt(size_t index) const;
- float GetNumberAt(size_t index) const;
+ float GetFloatAt(size_t index) const;
RetainPtr<CPDF_Dictionary> GetMutableDictAt(size_t index);
RetainPtr<const CPDF_Dictionary> GetDictAt(size_t index) const;
RetainPtr<CPDF_Stream> GetMutableStreamAt(size_t index);
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index 9ab64b9..b80a986 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -40,7 +40,7 @@
CPDF_Stream* stream_val) {
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));
@@ -714,7 +714,7 @@
for (size_t i = 0; i < arr->size(); ++i) {
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/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp
index 209aa8a..949e1de 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp
@@ -153,7 +153,7 @@
DCHECK(pArray->size() >= nCount);
std::vector<float> ret(nCount);
for (size_t i = 0; i < nCount; ++i)
- ret[i] = pArray->GetNumberAt(i);
+ ret[i] = pArray->GetFloatAt(i);
return ret;
}
diff --git a/core/fpdfapi/render/cpdf_rendershading.cpp b/core/fpdfapi/render/cpdf_rendershading.cpp
index 9b0248e..e9b7ab9 100644
--- a/core/fpdfapi/render/cpdf_rendershading.cpp
+++ b/core/fpdfapi/render/cpdf_rendershading.cpp
@@ -106,16 +106,16 @@
if (!pCoords)
return;
- float start_x = pCoords->GetNumberAt(0);
- float start_y = pCoords->GetNumberAt(1);
- float end_x = pCoords->GetNumberAt(2);
- float end_y = pCoords->GetNumberAt(3);
+ float start_x = pCoords->GetFloatAt(0);
+ float start_y = pCoords->GetFloatAt(1);
+ float end_x = pCoords->GetFloatAt(2);
+ float end_y = pCoords->GetFloatAt(3);
float t_min = 0;
float t_max = 1.0f;
const CPDF_Array* pArray = pDict->GetArrayFor("Domain");
if (pArray) {
- t_min = pArray->GetNumberAt(0);
- t_max = pArray->GetNumberAt(1);
+ t_min = pArray->GetFloatAt(0);
+ t_max = pArray->GetFloatAt(1);
}
pArray = pDict->GetArrayFor("Extend");
const bool bStartExtend = pArray && pArray->GetBooleanAt(0, false);
@@ -173,18 +173,18 @@
if (!pCoords)
return;
- float start_x = pCoords->GetNumberAt(0);
- float start_y = pCoords->GetNumberAt(1);
- float start_r = pCoords->GetNumberAt(2);
- float end_x = pCoords->GetNumberAt(3);
- float end_y = pCoords->GetNumberAt(4);
- float end_r = pCoords->GetNumberAt(5);
+ float start_x = pCoords->GetFloatAt(0);
+ float start_y = pCoords->GetFloatAt(1);
+ float start_r = pCoords->GetFloatAt(2);
+ float end_x = pCoords->GetFloatAt(3);
+ float end_y = pCoords->GetFloatAt(4);
+ float end_r = pCoords->GetFloatAt(5);
float t_min = 0;
float t_max = 1.0f;
const CPDF_Array* pArray = pDict->GetArrayFor("Domain");
if (pArray) {
- t_min = pArray->GetNumberAt(0);
- t_max = pArray->GetNumberAt(1);
+ t_min = pArray->GetFloatAt(0);
+ t_max = pArray->GetFloatAt(1);
}
pArray = pDict->GetArrayFor("Extend");
const bool bStartExtend = pArray && pArray->GetBooleanAt(0, false);
@@ -271,10 +271,10 @@
float xmax = 1.0f;
float ymax = 1.0f;
if (pDomain) {
- xmin = pDomain->GetNumberAt(0);
- xmax = pDomain->GetNumberAt(1);
- ymin = pDomain->GetNumberAt(2);
- ymax = pDomain->GetNumberAt(3);
+ xmin = pDomain->GetFloatAt(0);
+ xmax = pDomain->GetFloatAt(1);
+ ymin = pDomain->GetFloatAt(2);
+ ymax = pDomain->GetFloatAt(3);
}
CFX_Matrix mtDomain2Target = pDict->GetMatrixFor("Matrix");
CFX_Matrix matrix =
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 613d8f1..130a519 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -221,8 +221,8 @@
// pair1 = top_right.
return CFX_FloatRect(
- pArray->GetNumberAt(4 + nIndex * 8), pArray->GetNumberAt(5 + nIndex * 8),
- pArray->GetNumberAt(2 + nIndex * 8), pArray->GetNumberAt(3 + nIndex * 8));
+ pArray->GetFloatAt(4 + nIndex * 8), pArray->GetFloatAt(5 + nIndex * 8),
+ pArray->GetFloatAt(2 + nIndex * 8), pArray->GetFloatAt(3 + nIndex * 8));
}
// static
@@ -455,7 +455,7 @@
m_pAnnotDict->GetArrayFor(pdfium::annotation::kBorder);
style_char = 'S';
if (pBorderArray) {
- width = pBorderArray->GetNumberAt(2);
+ width = pBorderArray->GetFloatAt(2);
if (pBorderArray->size() == 4) {
// TODO(tsepez): convert to retained in future CPDF_Dictionary CLs.
pDashArray = pBorderArray->GetArrayAt(3).Get();
@@ -490,9 +490,9 @@
const CPDF_Array* pColor = m_pAnnotDict->GetArrayFor(pdfium::annotation::kC);
uint32_t argb = 0xff000000;
if (pColor) {
- int R = static_cast<int32_t>(pColor->GetNumberAt(0) * 255);
- int G = static_cast<int32_t>(pColor->GetNumberAt(1) * 255);
- int B = static_cast<int32_t>(pColor->GetNumberAt(2) * 255);
+ int R = static_cast<int32_t>(pColor->GetFloatAt(0) * 255);
+ int G = static_cast<int32_t>(pColor->GetFloatAt(1) * 255);
+ int B = static_cast<int32_t>(pColor->GetFloatAt(2) * 255);
argb = ArgbEncode(0xff, R, G, B);
}
CFX_GraphStateData graph_state;
diff --git a/core/fpdfdoc/cpdf_apsettings.cpp b/core/fpdfdoc/cpdf_apsettings.cpp
index 954615b..fa45551 100644
--- a/core/fpdfdoc/cpdf_apsettings.cpp
+++ b/core/fpdfdoc/cpdf_apsettings.cpp
@@ -40,20 +40,20 @@
const size_t dwCount = pEntry->size();
if (dwCount == 1) {
- const float g = pEntry->GetNumberAt(0) * 255;
+ const float g = pEntry->GetFloatAt(0) * 255;
return {CFX_Color::Type::kGray, ArgbEncode(255, (int)g, (int)g, (int)g)};
}
if (dwCount == 3) {
- float r = pEntry->GetNumberAt(0) * 255;
- float g = pEntry->GetNumberAt(1) * 255;
- float b = pEntry->GetNumberAt(2) * 255;
+ float r = pEntry->GetFloatAt(0) * 255;
+ float g = pEntry->GetFloatAt(1) * 255;
+ float b = pEntry->GetFloatAt(2) * 255;
return {CFX_Color::Type::kRGB, ArgbEncode(255, (int)r, (int)g, (int)b)};
}
if (dwCount == 4) {
- float c = pEntry->GetNumberAt(0);
- float m = pEntry->GetNumberAt(1);
- float y = pEntry->GetNumberAt(2);
- float k = pEntry->GetNumberAt(3);
+ float c = pEntry->GetFloatAt(0);
+ float m = pEntry->GetFloatAt(1);
+ float y = pEntry->GetFloatAt(2);
+ float k = pEntry->GetFloatAt(3);
float r = (1.0f - std::min(1.0f, c + k)) * 255;
float g = (1.0f - std::min(1.0f, m + k)) * 255;
float b = (1.0f - std::min(1.0f, y + k)) * 255;
@@ -69,7 +69,7 @@
return 0;
const CPDF_Array* pEntry = m_pDict->GetArrayFor(csEntry);
- return pEntry ? pEntry->GetNumberAt(index) : 0;
+ return pEntry ? pEntry->GetFloatAt(index) : 0;
}
CFX_Color CPDF_ApSettings::GetOriginalColor(const ByteString& csEntry) const {
@@ -82,16 +82,16 @@
size_t dwCount = pEntry->size();
if (dwCount == 1) {
- return CFX_Color(CFX_Color::Type::kGray, pEntry->GetNumberAt(0));
+ return CFX_Color(CFX_Color::Type::kGray, pEntry->GetFloatAt(0));
}
if (dwCount == 3) {
- return CFX_Color(CFX_Color::Type::kRGB, pEntry->GetNumberAt(0),
- pEntry->GetNumberAt(1), pEntry->GetNumberAt(2));
+ return CFX_Color(CFX_Color::Type::kRGB, pEntry->GetFloatAt(0),
+ pEntry->GetFloatAt(1), pEntry->GetFloatAt(2));
}
if (dwCount == 4) {
- return CFX_Color(CFX_Color::Type::kCMYK, pEntry->GetNumberAt(0),
- pEntry->GetNumberAt(1), pEntry->GetNumberAt(2),
- pEntry->GetNumberAt(3));
+ return CFX_Color(CFX_Color::Type::kCMYK, pEntry->GetFloatAt(0),
+ pEntry->GetFloatAt(1), pEntry->GetFloatAt(2),
+ pEntry->GetFloatAt(3));
}
return CFX_Color();
}
diff --git a/core/fpdfdoc/cpdf_color_utils.cpp b/core/fpdfdoc/cpdf_color_utils.cpp
index 6b79715..e4de010 100644
--- a/core/fpdfdoc/cpdf_color_utils.cpp
+++ b/core/fpdfdoc/cpdf_color_utils.cpp
@@ -17,16 +17,16 @@
CFX_Color rt;
switch (array.size()) {
case 1:
- rt = CFX_Color(CFX_Color::Type::kGray, array.GetNumberAt(0));
+ rt = CFX_Color(CFX_Color::Type::kGray, array.GetFloatAt(0));
break;
case 3:
- rt = CFX_Color(CFX_Color::Type::kRGB, array.GetNumberAt(0),
- array.GetNumberAt(1), array.GetNumberAt(2));
+ rt = CFX_Color(CFX_Color::Type::kRGB, array.GetFloatAt(0),
+ array.GetFloatAt(1), array.GetFloatAt(2));
break;
case 4:
- rt = CFX_Color(CFX_Color::Type::kCMYK, array.GetNumberAt(0),
- array.GetNumberAt(1), array.GetNumberAt(2),
- array.GetNumberAt(3));
+ rt = CFX_Color(CFX_Color::Type::kCMYK, array.GetFloatAt(0),
+ array.GetFloatAt(1), array.GetFloatAt(2),
+ array.GetFloatAt(3));
break;
}
return rt;
diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp
index 5c9720f..62ca7d5 100644
--- a/core/fpdfdoc/cpdf_dest.cpp
+++ b/core/fpdfdoc/cpdf_dest.cpp
@@ -141,5 +141,5 @@
}
float CPDF_Dest::GetParam(size_t index) const {
- return m_pArray ? m_pArray->GetNumberAt(2 + index) : 0;
+ return m_pArray ? m_pArray->GetFloatAt(2 + index) : 0;
}
diff --git a/core/fpdfdoc/cpdf_generateap.cpp b/core/fpdfdoc/cpdf_generateap.cpp
index 310b9da..b39039e 100644
--- a/core/fpdfdoc/cpdf_generateap.cpp
+++ b/core/fpdfdoc/cpdf_generateap.cpp
@@ -327,7 +327,7 @@
const CPDF_Array* pBorderArray =
locked_dict.GetArrayFor(pdfium::annotation::kBorder);
if (pBorderArray && pBorderArray->size() > 2)
- return pBorderArray->GetNumberAt(2);
+ return pBorderArray->GetFloatAt(2);
return 1;
}
@@ -357,7 +357,7 @@
sDashStream << "[";
for (size_t i = 0; i < pDashArrayCount; ++i)
- sDashStream << pDashArray->GetNumberAt(i) << " ";
+ sDashStream << pDashArray->GetFloatAt(i) << " ";
sDashStream << "] 0 d\n";
return ByteString(sDashStream);
@@ -668,12 +668,12 @@
if (!pInkCoordList || pInkCoordList->size() < 2)
continue;
- sAppStream << pInkCoordList->GetNumberAt(0) << " "
- << pInkCoordList->GetNumberAt(1) << " m ";
+ sAppStream << pInkCoordList->GetFloatAt(0) << " "
+ << pInkCoordList->GetFloatAt(1) << " m ";
for (size_t j = 0; j < pInkCoordList->size() - 1; j += 2) {
- sAppStream << pInkCoordList->GetNumberAt(j) << " "
- << pInkCoordList->GetNumberAt(j + 1) << " l ";
+ sAppStream << pInkCoordList->GetFloatAt(j) << " "
+ << pInkCoordList->GetFloatAt(j + 1) << " l ";
}
sAppStream << "S\n";
diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp
index 851f1db..0452da8 100644
--- a/core/fpdfdoc/cpdf_iconfit.cpp
+++ b/core/fpdfdoc/cpdf_iconfit.cpp
@@ -54,9 +54,9 @@
size_t dwCount = pA->size();
if (dwCount > 0)
- fLeft = pA->GetNumberAt(0);
+ fLeft = pA->GetFloatAt(0);
if (dwCount > 1)
- fBottom = pA->GetNumberAt(1);
+ fBottom = pA->GetFloatAt(1);
return {fLeft, fBottom};
}
@@ -73,8 +73,8 @@
return CFX_PointF();
size_t dwCount = pA->size();
- return {dwCount > 0 ? pA->GetNumberAt(0) : 0.0f,
- dwCount > 1 ? pA->GetNumberAt(1) : 0.0f};
+ return {dwCount > 0 ? pA->GetFloatAt(0) : 0.0f,
+ dwCount > 1 ? pA->GetFloatAt(1) : 0.0f};
}
CFX_VectorF CPDF_IconFit::GetScale(const CFX_SizeF& image_size,
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index fc3e585..e39be95 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2239,10 +2239,10 @@
SkPath skClip;
SkPath skPath;
if (kAxialShading == shadingType) {
- float start_x = pCoords->GetNumberAt(0);
- float start_y = pCoords->GetNumberAt(1);
- float end_x = pCoords->GetNumberAt(2);
- float end_y = pCoords->GetNumberAt(3);
+ float start_x = pCoords->GetFloatAt(0);
+ float start_y = pCoords->GetFloatAt(1);
+ float end_x = pCoords->GetFloatAt(2);
+ float end_y = pCoords->GetFloatAt(3);
SkPoint pts[] = {{start_x, start_y}, {end_x, end_y}};
skMatrix.mapPoints(pts, SK_ARRAY_COUNT(pts));
paint.setShader(
@@ -2279,12 +2279,12 @@
skPath.addRect(skRect);
skMatrix.setIdentity();
} else if (kRadialShading == shadingType) {
- float start_x = pCoords->GetNumberAt(0);
- float start_y = pCoords->GetNumberAt(1);
- float start_r = pCoords->GetNumberAt(2);
- float end_x = pCoords->GetNumberAt(3);
- float end_y = pCoords->GetNumberAt(4);
- float end_r = pCoords->GetNumberAt(5);
+ float start_x = pCoords->GetFloatAt(0);
+ float start_y = pCoords->GetFloatAt(1);
+ float start_r = pCoords->GetFloatAt(2);
+ float end_x = pCoords->GetFloatAt(3);
+ float end_y = pCoords->GetFloatAt(4);
+ float end_r = pCoords->GetFloatAt(5);
SkPoint pts[] = {{start_x, start_y}, {end_x, end_y}};
paint.setShader(SkGradientShader::MakeTwoPointConical(
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index c1102e4..3459125 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -894,7 +894,7 @@
// parameter that explains about the rest of |dest_array|.
if (dest_array) {
for (size_t i = 2; i < dest_array->size(); i++)
- dest_positions.push_back(dest_array->GetNumberAt(i));
+ dest_positions.push_back(dest_array->GetFloatAt(i));
}
DoGoToAction(dest.GetDestPageIndex(document), dest.GetZoomMode(),
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index e4f2423..9d261e8 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -250,14 +250,14 @@
return false;
quad_index *= 8;
- quad_points->x1 = array->GetNumberAt(quad_index);
- quad_points->y1 = array->GetNumberAt(quad_index + 1);
- quad_points->x2 = array->GetNumberAt(quad_index + 2);
- quad_points->y2 = array->GetNumberAt(quad_index + 3);
- quad_points->x3 = array->GetNumberAt(quad_index + 4);
- quad_points->y3 = array->GetNumberAt(quad_index + 5);
- quad_points->x4 = array->GetNumberAt(quad_index + 6);
- quad_points->y4 = array->GetNumberAt(quad_index + 7);
+ quad_points->x1 = array->GetFloatAt(quad_index);
+ quad_points->y1 = array->GetFloatAt(quad_index + 1);
+ quad_points->x2 = array->GetFloatAt(quad_index + 2);
+ quad_points->y2 = array->GetFloatAt(quad_index + 3);
+ quad_points->x3 = array->GetFloatAt(quad_index + 4);
+ quad_points->y3 = array->GetFloatAt(quad_index + 5);
+ quad_points->x4 = array->GetFloatAt(quad_index + 6);
+ quad_points->y4 = array->GetFloatAt(quad_index + 7);
return true;
}
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index ea60c8a..3493485 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -873,8 +873,8 @@
fxcrt::CollectionSize<unsigned long>(*vertices) / 2;
if (buffer && length >= points_len) {
for (unsigned long i = 0; i < points_len; ++i) {
- buffer[i].x = vertices->GetNumberAt(i * 2);
- buffer[i].y = vertices->GetNumberAt(i * 2 + 1);
+ buffer[i].x = vertices->GetFloatAt(i * 2);
+ buffer[i].y = vertices->GetFloatAt(i * 2 + 1);
}
}
return points_len;
@@ -904,8 +904,8 @@
fxcrt::CollectionSize<unsigned long>(*path) / 2;
if (buffer && length >= points_len) {
for (unsigned long i = 0; i < points_len; ++i) {
- buffer[i].x = path->GetNumberAt(i * 2);
- buffer[i].y = path->GetNumberAt(i * 2 + 1);
+ buffer[i].x = path->GetFloatAt(i * 2);
+ buffer[i].y = path->GetFloatAt(i * 2 + 1);
}
}
return points_len;
@@ -929,10 +929,10 @@
if (!line || line->size() < 4)
return false;
- start->x = line->GetNumberAt(0);
- start->y = line->GetNumberAt(1);
- end->x = line->GetNumberAt(2);
- end->y = line->GetNumberAt(3);
+ start->x = line->GetFloatAt(0);
+ start->y = line->GetFloatAt(1);
+ end->x = line->GetFloatAt(2);
+ end->y = line->GetFloatAt(3);
return true;
}
@@ -974,9 +974,9 @@
if (!border || border->size() < 3)
return false;
- *horizontal_radius = border->GetNumberAt(0);
- *vertical_radius = border->GetNumberAt(1);
- *border_width = border->GetNumberAt(2);
+ *horizontal_radius = border->GetFloatAt(0);
+ *vertical_radius = border->GetFloatAt(1);
+ *border_width = border->GetFloatAt(2);
return true;
}
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index f0b5725..642fad9 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -160,7 +160,7 @@
int num_cids_checked = 0;
int cur_cid = 0;
for (size_t idx = 0; idx < widths_array->size(); idx++) {
- int cid = widths_array->GetNumberAt(idx);
+ int cid = widths_array->GetFloatAt(idx);
EXPECT_GE(cid, cur_cid);
ASSERT_FALSE(++idx == widths_array->size());
RetainPtr<const CPDF_Object> next = widths_array->GetObjectAt(idx);
@@ -170,7 +170,7 @@
int cnt = static_cast<int>(arr->size());
size_t inner_idx = 0;
for (cur_cid = cid; cur_cid < cid + cnt; cur_cid++) {
- int width = arr->GetNumberAt(inner_idx++);
+ int width = arr->GetFloatAt(inner_idx++);
EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid))
<< " at cid " << cur_cid;
}
@@ -181,7 +181,7 @@
ASSERT_TRUE(next->IsNumber());
int last_cid = next->AsNumber()->GetInteger();
ASSERT_FALSE(++idx == widths_array->size());
- int width = widths_array->GetNumberAt(idx);
+ int width = widths_array->GetFloatAt(idx);
for (cur_cid = cid; cur_cid <= last_cid; cur_cid++) {
EXPECT_EQ(width, typed_font->GetCharWidthF(cur_cid))
<< " at cid " << cur_cid;
@@ -2954,9 +2954,9 @@
const CPDF_Array* widths_array = font_dict->GetArrayFor("Widths");
ASSERT_TRUE(widths_array);
ASSERT_EQ(224u, widths_array->size());
- EXPECT_EQ(250, widths_array->GetNumberAt(0));
- EXPECT_EQ(569, widths_array->GetNumberAt(11));
- EXPECT_EQ(500, widths_array->GetNumberAt(223));
+ EXPECT_EQ(250, widths_array->GetFloatAt(0));
+ EXPECT_EQ(569, widths_array->GetFloatAt(11));
+ EXPECT_EQ(500, widths_array->GetFloatAt(223));
CheckFontDescriptor(font_dict, FPDF_FONT_TYPE1, true, false, span);
}
@@ -2983,9 +2983,9 @@
const CPDF_Array* widths_array = font_dict->GetArrayFor("Widths");
ASSERT_TRUE(widths_array);
ASSERT_EQ(224u, widths_array->size());
- EXPECT_EQ(600, widths_array->GetNumberAt(33));
- EXPECT_EQ(600, widths_array->GetNumberAt(74));
- EXPECT_EQ(600, widths_array->GetNumberAt(223));
+ EXPECT_EQ(600, widths_array->GetFloatAt(33));
+ EXPECT_EQ(600, widths_array->GetFloatAt(74));
+ EXPECT_EQ(600, widths_array->GetFloatAt(223));
CheckFontDescriptor(font_dict, FPDF_FONT_TRUETYPE, false, false, span);
}
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index b15efac..1db1d21 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -54,10 +54,10 @@
if (!pArray)
return false;
- *left = pArray->GetNumberAt(0);
- *bottom = pArray->GetNumberAt(1);
- *right = pArray->GetNumberAt(2);
- *top = pArray->GetNumberAt(3);
+ *left = pArray->GetFloatAt(0);
+ *bottom = pArray->GetFloatAt(1);
+ *right = pArray->GetFloatAt(2);
+ *top = pArray->GetFloatAt(3);
return true;
}
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 5e0b81e..3e19969 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -1392,7 +1392,7 @@
std::vector<float> scrollPositionArray;
if (arrayObject) {
for (size_t i = 2; i < arrayObject->size(); i++)
- scrollPositionArray.push_back(arrayObject->GetNumberAt(i));
+ scrollPositionArray.push_back(arrayObject->GetFloatAt(i));
}
pRuntime->BeginBlock();
m_pFormFillEnv->DoGoToAction(dest.GetDestPageIndex(pDocument),
