commit 8071fc75da163ed66e5e3b5fa6e7869a63bfb8a7
author Lei Zhang <thestig@chromium.org> Mon Sep 17 16:44:51 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Sep 17 16:44:51 2018 +0000
tree cb9d321d9d60dad1a50d69f0b4a974af11aab93b
parent e2e31ee53920d18fd4f138c5292860f338846c95

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 <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_editpage.cpp

diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 0ff7a11..3004934 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -267,10 +267,6 @@
   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))

fpdfsdk/fpdf_view_c_api_test.c

diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index 393a8f6..2c86651 100644
--- a/fpdfsdk/fpdf_view_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -172,7 +172,6 @@
     CHK(FPDFPageObj_SetStrokeColor);
     CHK(FPDFPageObj_SetStrokeWidth);
     CHK(FPDFPageObj_Transform);
-    CHK(FPDFPage_CountObject);
     CHK(FPDFPage_CountObjects);
     CHK(FPDFPage_Delete);
     CHK(FPDFPage_GenerateContent);

public/fpdf_edit.h

diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
index 577ae7f..dcf6201 100644
--- a/public/fpdf_edit.h
+++ b/public/fpdf_edit.h
@@ -178,15 +178,6 @@
 //   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.
-//
-// Returns the number of objects in |page|.
 FPDF_EXPORT int FPDF_CALLCONV FPDFPage_CountObjects(FPDF_PAGE page);
 
 // Get object in |page| at |index|.