diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-02-01 17:07:13 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-01 17:07:13 +0000 |
| commit | 71a7d377ff36a0be1af1848d5cac0ccb83ae725d (patch) | |
| tree | c7f26301bbfcd45126900f7bbc0dc88f5e8a8946 /fpdfsdk/fpdfdoc.cpp | |
| parent | 1fc533150a27257de4830559a14499f2e903dce9 (diff) | |
| download | pdfium-71a7d377ff36a0be1af1848d5cac0ccb83ae725d.tar.xz | |
Deprecate FPDFDest_GetPageIndex and create a fixed version.
FPDFDest_GetDestPageIndex() has a well defined return value for
errors (-1). Keeping FPDFDest_GetPageIndex() to avoid changing
behavior of the old API for whoever relies on it.
Bug: pdfium:938
Change-Id: Iad528923cb156e957a419540c262a65f45cb777d
Reviewed-on: https://pdfium-review.googlesource.com/24811
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdfdoc.cpp')
| -rw-r--r-- | fpdfsdk/fpdfdoc.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index 47ecf4223b..4b51d6391d 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -200,14 +200,29 @@ FPDFAction_GetURIPath(FPDF_DOCUMENT document, } FPDF_EXPORT unsigned long FPDF_CALLCONV -FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST pDict) { - if (!pDict) +FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST pDest) { + if (!pDest) return 0; + CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); if (!pDoc) return 0; - CPDF_Dest dest(static_cast<CPDF_Array*>(pDict)); - return dest.GetPageIndex(pDoc); + + CPDF_Dest dest(static_cast<CPDF_Array*>(pDest)); + return dest.GetPageIndexDeprecated(pDoc); +} + +FPDF_EXPORT long FPDF_CALLCONV FPDFDest_GetDestPageIndex(FPDF_DOCUMENT document, + FPDF_DEST pDest) { + if (!pDest) + return -1; + + CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document); + if (!pDoc) + return -1; + + CPDF_Dest dest(static_cast<CPDF_Array*>(pDest)); + return dest.GetDestPageIndex(pDoc); } FPDF_EXPORT unsigned long FPDF_CALLCONV |