From 8071fc75da163ed66e5e3b5fa6e7869a63bfb8a7 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 17 Sep 2018 16:44:51 +0000 Subject: Remove deprecated FPDFPage_CountObject(). FPDFPage_CountObjects() is the straight-forward replacement that has been available for a year. Change-Id: I64cd379f81234d8295bfcaf9b6effe3467f100d6 Reviewed-on: https://pdfium-review.googlesource.com/42451 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- fpdfsdk/fpdf_editpage.cpp | 4 ---- fpdfsdk/fpdf_view_c_api_test.c | 1 - public/fpdf_edit.h | 9 --------- 3 files changed, 14 deletions(-) diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 0ff7a119a0..30049342ca 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -267,10 +267,6 @@ FPDFPage_RemoveObject(FPDF_PAGE page, FPDF_PAGEOBJECT page_obj) { return pPage->RemovePageObject(pPageObj); } -FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObject(FPDF_PAGE page) { - return FPDFPage_CountObjects(page); -} - FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObjects(FPDF_PAGE page) { CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!IsPageObject(pPage)) diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c index 393a8f66e8..2c8665156e 100644 --- a/fpdfsdk/fpdf_view_c_api_test.c +++ b/fpdfsdk/fpdf_view_c_api_test.c @@ -172,7 +172,6 @@ int CheckPDFiumCApi() { CHK(FPDFPageObj_SetStrokeColor); CHK(FPDFPageObj_SetStrokeWidth); CHK(FPDFPageObj_Transform); - CHK(FPDFPage_CountObject); CHK(FPDFPage_CountObjects); CHK(FPDFPage_Delete); CHK(FPDFPage_GenerateContent); diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h index 577ae7fac1..dcf6201fe8 100644 --- a/public/fpdf_edit.h +++ b/public/fpdf_edit.h @@ -173,15 +173,6 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFPage_InsertObject(FPDF_PAGE page, FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_RemoveObject(FPDF_PAGE page, FPDF_PAGEOBJECT page_obj); -// Get number of page objects inside |page|. -// -// page - handle to a page. -// -// Returns the number of objects in |page|. -// -// DEPRECATED. Please use FPDFPage_CountObjects. -FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObject(FPDF_PAGE page); - // Get number of page objects inside |page|. // // page - handle to a page. -- cgit v1.2.3