Merge to XFA: Make conversion between CPDF_Dest and its object explicit.

fpdfsdk/src/fpdfdoc.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../include/fsdk_define.h"
 #include "../include/fpdfdoc.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 68 matching lines @@
 DLLEXPORT FPDF_DEST STDCALL FPDFBookmark_GetDest(FPDF_DOCUMENT document, FPDF_BOOKMARK pDict)
 {
         if (!document)
                 return NULL;
         if (!pDict)
                 return NULL;
         CPDF_Bookmark bookmark((CPDF_Dictionary*)pDict);
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
         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)
 {
         if (!pDict)
                 return NULL;
         CPDF_Bookmark bookmark((CPDF_Dictionary*)pDict);
         return bookmark.GetAction().GetDict();
 }
 
@@ skipping 19 matching lines @@
 }
 
 DLLEXPORT FPDF_DEST STDCALL FPDFAction_GetDest(FPDF_DOCUMENT document, FPDF_ACTION pDict)
 {
         if (!document)
                 return NULL;
         if (!pDict)
                 return NULL;
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
         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,
                                                                                           void* buffer, unsigned long buflen)
 {
         if (!document)
                 return 0;
         if (!pDict)
                 return 0;
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
         CPDF_Action action((CPDF_Dictionary*)pDict);
         CFX_ByteString path = action.GetURI(pDoc);
         unsigned long len = path.GetLength() + 1;
         if (buffer != NULL && buflen >= len)
                 FXSYS_memcpy(buffer, path.c_str(), len);
         return len;
 }
 
 DLLEXPORT unsigned long STDCALL FPDFDest_GetPageIndex(FPDF_DOCUMENT document, FPDF_DEST pDict)
 {
         if (!document)
                 return 0;
         if (!pDict)
                 return 0;
         CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
-        CPDF_Dest dest = (CPDF_Array*)pDict;
+        CPDF_Dest dest((CPDF_Array*)pDict);
         return dest.GetPageIndex(pDoc);
 }
 
 static void ReleaseLinkList(FX_LPVOID data)
 {
         delete (CPDF_LinkList*)data;
 }
 
 DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, double y)
 {
@@ skipping 14 matching lines @@
 
 DLLEXPORT FPDF_DEST STDCALL FPDFLink_GetDest(FPDF_DOCUMENT document, FPDF_LINK pDict)
 {
         if (!document)
                 return NULL;
     CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc();
         if (!pDict)
                 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)
 {
         if (!pDict)
                 return NULL;
         CPDF_Link link = (CPDF_Dictionary*)pDict;
         return link.GetAction().GetDict();
 }
 
@@ skipping 79 matching lines @@
                 return 0;
         CFX_WideString text = pInfo->GetUnicodeText(tag);
         // Use UTF-16LE encoding
         CFX_ByteString encodedText = text.UTF16LE_Encode();
         unsigned long len = encodedText.GetLength();
         if (buffer && buflen >= len) {
                 FXSYS_memcpy(buffer, encodedText.c_str(), len);
         }
         return len;
 }