Make conversion between CPDF_Dest and its object explicit.

Precursor to taking a second shot at cleaning up the FPDF_*
APIs.  A FPDF_Dest is a CPDF_Array, and a CPDF_Dest
is a structure holding a FPDF_Dest.  This goes against the
convention that FPDF_ types get cast to CPDF_* types, so we
want to make it clear where objects are getting constructed,
etc.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/984703004

1 files changed, 6 insertions, 6 deletions

diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp
index f21d5cf938..ab3dd2c5b8 100644
--- a/fpdfsdk/src/fpdfdoc.cpp
+++ b/fpdfsdk/src/fpdfdoc.cpp
@@ -84,12 +84,12 @@ DLLEXPORT FPDF_DEST STDCALL FPDFBookmark_GetDest(FPDF_DOCUMENT document, FPDF_BO
 	CPDF_Document* pDoc = (CPDF_Document*)document;
 	CPDF_Dest dest = bookmark.GetDest(pDoc);
 	if (dest)
-		return dest;
+		return dest.GetObject();
 	// If this bookmark is not directly associated with a dest, we try to get action
 	CPDF_Action action = bookmark.GetAction();
 	if (!action)
 		return NULL;
-	return action.GetDest(pDoc);
+	return action.GetDest(pDoc).GetObject();
 }
 
 DLLEXPORT FPDF_ACTION STDCALL FPDFBookmark_GetAction(FPDF_BOOKMARK pDict)
@@ -129,7 +129,7 @@ DLLEXPORT FPDF_DEST STDCALL FPDFAction_GetDest(FPDF_DOCUMENT document, FPDF_ACTI
 		return NULL;
 	CPDF_Document* pDoc = (CPDF_Document*)document;
 	CPDF_Action action((CPDF_Dictionary*)pDict);
-	return action.GetDest(pDoc);
+	return action.GetDest(pDoc).GetObject();
 }
 
 DLLEXPORT unsigned long STDCALL FPDFAction_GetURIPath(FPDF_DOCUMENT document, FPDF_ACTION pDict,
@@ -155,7 +155,7 @@ DLLEXPORT unsigned long STDCALL FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FP
 	if (!pDict)
 		return 0;
 	CPDF_Document* pDoc = (CPDF_Document*)document;
-	CPDF_Dest dest = (CPDF_Array*)pDict;
+	CPDF_Dest dest((CPDF_Array*)pDict);
 	return dest.GetPageIndex(pDoc);
 }
 
@@ -188,14 +188,14 @@ DLLEXPORT FPDF_DEST STDCALL FPDFLink_GetDest(FPDF_DOCUMENT document, FPDF_LINK p
 		return NULL;
 	CPDF_Link link = (CPDF_Dictionary*)pDict;
 
-	FPDF_DEST dest = link.GetDest(pDoc);
+	FPDF_DEST dest = link.GetDest(pDoc).GetObject();
 	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)
 		return NULL;
-	return action.GetDest(pDoc);
+	return action.GetDest(pDoc).GetObject();
 }
 
 DLLEXPORT FPDF_ACTION STDCALL FPDFLink_GetAction(FPDF_LINK pDict)