You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/01/10 16:10:39 UTC

svn commit: r1850957 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Author: tilman
Date: Thu Jan 10 16:10:39 2019
New Revision: 1850957

URL: http://svn.apache.org/viewvc?rev=1850957&view=rev
Log:
PDFBOX-4399: consider OCG from annotation

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1850957&r1=1850956&r2=1850957&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Thu Jan 10 16:10:39 2019
@@ -1283,6 +1283,26 @@ public class PageDrawer extends PDFGraph
         {
             return;
         }
+
+        //TODO DRY-refactor this and the code from beginMarkedContentSequence() when PDFBOX-4399 is mostly done
+        PDPropertyList propertyList = annotation.getOptionalContent();
+        if (propertyList instanceof PDOptionalContentGroup)
+        {
+            PDOptionalContentGroup group = (PDOptionalContentGroup) propertyList;
+            RenderState printState = group.getRenderState(destination);
+            if (printState == null)
+            {
+                if (!getRenderer().isGroupEnabled(group))
+                {
+                    return;
+                }
+            }
+            else if (RenderState.OFF.equals(printState))
+            {
+                return;
+            }
+        }
+
         super.showAnnotation(annotation);
 
         if (annotation.getAppearance() == null)