From 8a07b7fb14f11204a0d840792ab9f4bd54b066e5 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 17 Oct 2016 17:13:32 +0200 Subject: Clean up link destination handling. All link destinations should be URIs, and a document specific function can be called to resolve them to actual page numbers. Outlines have cached page numbers as well as string URIs. --- platform/ios/Classes/MuHitView.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'platform/ios/Classes/MuHitView.m') diff --git a/platform/ios/Classes/MuHitView.m b/platform/ios/Classes/MuHitView.m index e94ac94a..b0a1ac4a 100644 --- a/platform/ios/Classes/MuHitView.m +++ b/platform/ios/Classes/MuHitView.m @@ -44,14 +44,19 @@ pageSize = CGSizeMake(100,100); while (link && hitCount < nelem(hitRects)) { - if (link->dest.kind == FZ_LINK_GOTO || link->dest.kind == FZ_LINK_URI) { + if (link->uri) { fz_rect bbox = link->rect; hitRects[hitCount].origin.x = bbox.x0; hitRects[hitCount].origin.y = bbox.y0; hitRects[hitCount].size.width = bbox.x1 - bbox.x0; hitRects[hitCount].size.height = bbox.y1 - bbox.y0; - linkPage[hitCount] = link->dest.kind == FZ_LINK_GOTO ? link->dest.ld.gotor.page : -1; - linkUrl[hitCount] = link->dest.kind == FZ_LINK_URI ? strdup(link->dest.ld.uri.uri) : nil; + if (fz_is_external_link(ctx, link->uri)) { + linkPage[hitCount] = -1; + linkUrl[hitCount] = strdup(link->uri); + } else { + linkPage[hitCount] = fz_resolve_link(ctx, doc, link->uri); + linkUrl[hitCount] = nil; + } hitCount++; } link = link->next; -- cgit v1.2.3