Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Destination with index #133

Merged
merged 10 commits into from
Sep 12, 2020
Merged

Destination with index #133

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2f91945
Fixes conflict with PropertiesManager renaming
gtache Feb 12, 2020
693213f
Merge branch 'master' of github.com:pcorless/icepdf
gtache Feb 17, 2020
db0b33f
Merge branch 'master' of github.com:pcorless/icepdf
gtache Feb 28, 2020
a4b0f97
Merge branch 'master' of github.com:pcorless/icepdf
gtache May 12, 2020
f3f99cd
Merge branch 'master' of github.com:pcorless/icepdf
gtache May 14, 2020
ef55851
Merge branch 'master' of github.com:pcorless/icepdf
gtache Jul 8, 2020
ac12aaa
Merge branch 'master' of github.com:pcorless/icepdf
gtache Aug 17, 2020
8b28b29
Merge branch 'master' of github.com:pcorless/icepdf
gtache Aug 21, 2020
3a48551
GH-132 Fixes destination pointing to a page number instead of a page …
gtache Sep 3, 2020
80c6d1f
GH-132 Removes PageTree field in Destination
gtache Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core/core-awt/src/main/java/org/icepdf/core/pobjects/Destination.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class Destination extends Dictionary {
// Reference object for destination
private Reference ref;

// type, /XYZ, /Fit, /FitH...
// type, /XYZ, /Fit, /FitH...
private Name type;

// Specified by /XYZ in the core, /(left)(top)(zoom)
Expand Down Expand Up @@ -236,6 +236,13 @@ private void parse(List v) {
Object ob = getDestValue(0, v);
if (ob instanceof Reference) {
ref = (Reference) ob;
} else if (ob instanceof Integer) {
Copy link
Owner

@pcorless pcorless Sep 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably suggest somthing like, not point keeping the pageTree reference around:

// Dest could be a page number instead of a reference
final int idx = (int) ob;
PageTree pageTree = library.getCatalog().getPageTree();
if (idx >= 0 && idx < pageTree.getNumberOfPages()) {
ref = pageTree.getPageReference(idx);
}

Interstingly this is one of those special corners cases were the notion isn't in the specification.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I was tired, I was assuming we didn't have access to library in this object for some reason...
Thanks for pointing that out.
Yeah I found that quite strange, I don't know how that pdf got created.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries and thank you for providing the fix!

//Dest could be a page number instead of a reference
final PageTree pt = library.getCatalog().getPageTree();
final int idx = (int) ob;
if (idx >= 0 && idx < pt.getNumberOfPages()) {
ref = pt.getPageReference(idx);
}
}
// store type.
ob = getDestValue(1, v);
Expand Down