diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-06 12:37:13 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-06 12:37:13 -0800 |
| commit | 4cc9acb6ca21590b68044d189d276985883373e4 (patch) | |
| tree | 9588d94757649025a44194541d3d265b191b5357 /fpdfsdk | |
| parent | ac8d1e75645d783cc72d2cfd57554e48e3ed2999 (diff) | |
| download | pdfium-4cc9acb6ca21590b68044d189d276985883373e4.tar.xz | |
Merge to XFA: Make conversions for CPDF_Link explicit.
Original Review URL: https://codereview.chromium.org/985503005
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/985153002
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/src/fpdfdoc.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index e89a7aa294..1cd7c8be3b 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -180,18 +180,17 @@ DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, do pLinkList = FX_NEW CPDF_LinkList(pDoc); pDoc->SetPrivateData(&THISMODULE, pLinkList, ReleaseLinkList); } - return pLinkList->GetLinkAtPoint(pPage, (FX_FLOAT)x, (FX_FLOAT)y); + return pLinkList->GetLinkAtPoint(pPage, (FX_FLOAT)x, (FX_FLOAT)y).GetDict(); } 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; - + CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc(); + CPDF_Link link((CPDF_Dictionary*)pDict); FPDF_DEST dest = link.GetDest(pDoc).GetObject(); if (dest) return dest; @@ -206,7 +205,7 @@ DLLEXPORT FPDF_ACTION STDCALL FPDFLink_GetAction(FPDF_LINK pDict) { if (!pDict) return NULL; - CPDF_Link link = (CPDF_Dictionary*)pDict; + CPDF_Link link((CPDF_Dictionary*)pDict); return link.GetAction().GetDict(); } |