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

FIxes missing popups #141

Merged
merged 11 commits into from
Sep 23, 2020
Merged

FIxes missing popups #141

Changes from all commits
Commits
Show all changes
11 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
2bcaafc
Merge branch 'master' of github.com:pcorless/icepdf
gtache Sep 8, 2020
4afc564
GH-140 Checks for missing popup annotations when initing page annotat…
gtache Sep 11, 2020
878572a
GH-140 Checks for null popup
gtache Sep 11, 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
17 changes: 14 additions & 3 deletions core/core-awt/src/main/java/org/icepdf/core/pobjects/Page.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.icepdf.core.pobjects.annotations.Annotation;
import org.icepdf.core.pobjects.annotations.FreeTextAnnotation;
import org.icepdf.core.pobjects.annotations.MarkupAnnotation;
import org.icepdf.core.pobjects.annotations.PopupAnnotation;
import org.icepdf.core.pobjects.graphics.Shapes;
import org.icepdf.core.pobjects.graphics.WatermarkCallback;
import org.icepdf.core.pobjects.graphics.text.GlyphText;
Expand All @@ -34,10 +35,8 @@
import java.awt.geom.*;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.*;
import java.util.List;
import java.util.Stack;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -359,6 +358,18 @@ else if (annotObj instanceof HashMap) { // HashMap lacks "Type"->"Annot" entry
a != null ? " " + a.getPObjectReference() + a.getEntries() : "");
}
}
//The popup annotations may not be referenced in the page annotations entry, we have to add them manually.
final Set<Annotation> annotSet = new HashSet<>(annotations);
for (final Annotation annot : annotSet) {
if (annot instanceof MarkupAnnotation) {
final PopupAnnotation popup = ((MarkupAnnotation) annot).getPopupAnnotation();
if (popup != null && !annotSet.contains(popup)) {
popup.init();
v.add(popup);
annotations.add(popup);
}
}
}
}
}

Expand Down