From 140deadc0cb8035c05aaabebe05d6aa6c5291829 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Wed, 11 Jul 2018 21:40:03 +0000 Subject: Remove clunky mark property value getters by index. The key getters are necessary to list the properties, but after getting those keys, the *ByKey functions can be called. These functions are therefore unnecessary. In a follow-up CL, I will remove the "ByKey" suffix from the other versions. Bug: pdfium:1037 Change-Id: I02760025470a295971c4900fce1b6a8bbc7a5820 Reviewed-on: https://pdfium-review.googlesource.com/37590 Commit-Queue: Henrique Nakashima Reviewed-by: Lei Zhang --- fpdfsdk/fpdf_edit_embeddertest.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'fpdfsdk/fpdf_edit_embeddertest.cpp') diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp index 52cc9fed86..ee80f3a20c 100644 --- a/fpdfsdk/fpdf_edit_embeddertest.cpp +++ b/fpdfsdk/fpdf_edit_embeddertest.cpp @@ -559,13 +559,9 @@ void CheckMarkCounts(FPDF_PAGE page, GetPlatformWString(reinterpret_cast(buffer)); EXPECT_EQ(L"Factor", key); - EXPECT_EQ(FPDF_OBJECT_NUMBER, - FPDFPageObjMark_GetParamValueType(mark, 0)); - int square_root = FPDFPageObjMark_GetParamIntValue(mark, 0); - EXPECT_EQ(expected_square, square_root * square_root); - EXPECT_EQ(FPDF_OBJECT_NUMBER, FPDFPageObjMark_GetParamValueTypeByKey(mark, "Factor")); + int square_root; EXPECT_TRUE(FPDFPageObjMark_GetParamIntValueByKey(mark, "Factor", &square_root)); EXPECT_EQ(expected_square, square_root * square_root); @@ -583,16 +579,6 @@ void CheckMarkCounts(FPDF_PAGE page, GetPlatformWString(reinterpret_cast(buffer)); EXPECT_EQ(L"Position", key); - EXPECT_EQ(FPDF_OBJECT_STRING, - FPDFPageObjMark_GetParamValueType(mark, 0)); - unsigned long get_param_value_return = - FPDFPageObjMark_GetParamStringValue(mark, 0, buffer, 256); - ASSERT_GT(get_param_value_return, 0u); - EXPECT_EQ((4u + 1u) * 2u, get_param_value_return); - std::wstring value = - GetPlatformWString(reinterpret_cast(buffer)); - EXPECT_EQ(L"Last", value); - // Should be the last object. EXPECT_EQ(object_count - 1, i); @@ -603,7 +589,8 @@ void CheckMarkCounts(FPDF_PAGE page, mark, "Position", buffer, 256, &length)); ASSERT_GT(length, 0u); EXPECT_EQ((4u + 1u) * 2u, length); - value = GetPlatformWString(reinterpret_cast(buffer)); + std::wstring value = + GetPlatformWString(reinterpret_cast(buffer)); EXPECT_EQ(L"Last", value); } else { FAIL(); -- cgit v1.2.3