From 92627618a93720c6153828b8a8d1c6ed17c6e91f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 25 Sep 2017 12:59:29 +0200 Subject: API: rename FPDFPage_CountObject() to FPDFPage_CountObjects() Keep the old name, but mark it as deprecated and don't use it in own code. Change-Id: I17b88dccacf494a03562c0d003cfcb2bc03bf430 Reviewed-on: https://pdfium-review.googlesource.com/14750 Reviewed-by: dsinclair Commit-Queue: dsinclair --- fpdfsdk/fpdfeditimg_unittest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/fpdfeditimg_unittest.cpp') diff --git a/fpdfsdk/fpdfeditimg_unittest.cpp b/fpdfsdk/fpdfeditimg_unittest.cpp index 0ff3db8e2d..fcc081ab76 100644 --- a/fpdfsdk/fpdfeditimg_unittest.cpp +++ b/fpdfsdk/fpdfeditimg_unittest.cpp @@ -16,17 +16,17 @@ class PDFEditTest : public testing::Test { TEST_F(PDFEditTest, InsertObjectWithInvalidPage) { FPDF_DOCUMENT doc = FPDF_CreateNewDocument(); FPDF_PAGE page = FPDFPage_New(doc, 0, 100, 100); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); FPDFPage_InsertObject(nullptr, nullptr); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); FPDFPage_InsertObject(page, nullptr); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); FPDF_PAGEOBJECT page_image = FPDFPageObj_NewImageObj(doc); FPDFPage_InsertObject(nullptr, page_image); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); FPDF_ClosePage(page); FPDF_CloseDocument(doc); @@ -35,11 +35,11 @@ TEST_F(PDFEditTest, InsertObjectWithInvalidPage) { TEST_F(PDFEditTest, NewImageObj) { FPDF_DOCUMENT doc = FPDF_CreateNewDocument(); FPDF_PAGE page = FPDFPage_New(doc, 0, 100, 100); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); FPDF_PAGEOBJECT page_image = FPDFPageObj_NewImageObj(doc); FPDFPage_InsertObject(page, page_image); - EXPECT_EQ(1, FPDFPage_CountObject(page)); + EXPECT_EQ(1, FPDFPage_CountObjects(page)); EXPECT_TRUE(FPDFPage_GenerateContent(page)); FPDF_ClosePage(page); @@ -49,7 +49,7 @@ TEST_F(PDFEditTest, NewImageObj) { TEST_F(PDFEditTest, NewImageObjGenerateContent) { FPDF_DOCUMENT doc = FPDF_CreateNewDocument(); FPDF_PAGE page = FPDFPage_New(doc, 0, 100, 100); - EXPECT_EQ(0, FPDFPage_CountObject(page)); + EXPECT_EQ(0, FPDFPage_CountObjects(page)); constexpr int kBitmapSize = 50; FPDF_BITMAP bitmap = FPDFBitmap_Create(kBitmapSize, kBitmapSize, 0); @@ -62,7 +62,7 @@ TEST_F(PDFEditTest, NewImageObjGenerateContent) { ASSERT_TRUE( FPDFImageObj_SetMatrix(page_image, kBitmapSize, 0, 0, kBitmapSize, 0, 0)); FPDFPage_InsertObject(page, page_image); - EXPECT_EQ(1, FPDFPage_CountObject(page)); + EXPECT_EQ(1, FPDFPage_CountObjects(page)); EXPECT_TRUE(FPDFPage_GenerateContent(page)); FPDFBitmap_Destroy(bitmap); -- cgit v1.2.3