From 76525c4a9d2aa6d1f2685d8483e3d491fd361df1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 27 Aug 2018 18:57:36 +0000 Subject: Remove unnecessary ToArray() calls and locals in CPDF_Dest. Rename GetObject() to GetArray() and remove more ToArray() calls. Change-Id: I754ca72b32c085e1801d3cedcd291ce4d2682359 Reviewed-on: https://pdfium-review.googlesource.com/41353 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fpdfsdk/fpdf_doc.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/fpdf_doc.cpp') diff --git a/fpdfsdk/fpdf_doc.cpp b/fpdfsdk/fpdf_doc.cpp index 1f0d4f27e0..d3c8e23818 100644 --- a/fpdfsdk/fpdf_doc.cpp +++ b/fpdfsdk/fpdf_doc.cpp @@ -121,14 +121,14 @@ FPDF_EXPORT FPDF_DEST FPDF_CALLCONV FPDFBookmark_GetDest(FPDF_DOCUMENT document, return nullptr; CPDF_Bookmark bookmark(CPDFDictionaryFromFPDFBookmark(pDict)); CPDF_Dest dest = bookmark.GetDest(pDoc); - if (dest.GetObject()) - return FPDFDestFromCPDFArray(dest.GetObject()); + if (dest.GetArray()) + return FPDFDestFromCPDFArray(dest.GetArray()); // If this bookmark is not directly associated with a dest, we try to get // action CPDF_Action action = bookmark.GetAction(); if (!action.GetDict()) return nullptr; - return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetObject()); + return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetArray()); } FPDF_EXPORT FPDF_ACTION FPDF_CALLCONV @@ -167,7 +167,7 @@ FPDF_EXPORT FPDF_DEST FPDF_CALLCONV FPDFAction_GetDest(FPDF_DOCUMENT document, if (!pDoc) return nullptr; CPDF_Action action(CPDFDictionaryFromFPDFAction(pDict)); - return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetObject()); + return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetArray()); } FPDF_EXPORT unsigned long FPDF_CALLCONV @@ -302,14 +302,14 @@ FPDF_EXPORT FPDF_DEST FPDF_CALLCONV FPDFLink_GetDest(FPDF_DOCUMENT document, if (!pDoc) return nullptr; CPDF_Link link(CPDFDictionaryFromFPDFLink(pDict)); - FPDF_DEST dest = FPDFDestFromCPDFArray(link.GetDest(pDoc).GetObject()); + FPDF_DEST dest = FPDFDestFromCPDFArray(link.GetDest(pDoc).GetArray()); if (dest) return dest; // If this link is not directly associated with a dest, we try to get action CPDF_Action action = link.GetAction(); if (!action.GetDict()) return nullptr; - return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetObject()); + return FPDFDestFromCPDFArray(action.GetDest(pDoc).GetArray()); } FPDF_EXPORT FPDF_ACTION FPDF_CALLCONV FPDFLink_GetAction(FPDF_LINK pDict) { -- cgit v1.2.3