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/11 07:56:24 UTC
svn commit: r1851016 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Author: tilman
Date: Fri Jan 11 07:56:24 2019
New Revision: 1851016
URL: http://svn.apache.org/viewvc?rev=1851016&view=rev
Log:
PDFBOX-4399: do graphics drawing operations and forms / transparency groups only when active OCG, but do all the rest all the time
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=1851016&r1=1851015&r2=1851016&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 Fri Jan 11 07:56:24 2019
@@ -57,7 +57,6 @@ import java.util.Stack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
-import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -82,6 +81,7 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
import org.apache.pdfbox.pdmodel.graphics.color.PDPattern;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDTransparencyGroup;
import org.apache.pdfbox.pdmodel.graphics.image.PDImage;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
@@ -500,7 +500,10 @@ public class PageDrawer extends PDFGraph
graphics.setComposite(state.getNonStrokingJavaComposite());
graphics.setPaint(getNonStrokingPaint());
setClip();
- graphics.fill(glyph);
+ if (isContentRendered())
+ {
+ graphics.fill(glyph);
+ }
}
if (renderingMode.isStroke())
@@ -509,7 +512,10 @@ public class PageDrawer extends PDFGraph
graphics.setPaint(getStrokingPaint());
graphics.setStroke(getStroke());
setClip();
- graphics.draw(glyph);
+ if (isContentRendered())
+ {
+ graphics.draw(glyph);
+ }
}
if (renderingMode.isClip())
@@ -759,7 +765,10 @@ public class PageDrawer extends PDFGraph
graphics.setStroke(getStroke());
setClip();
//TODO bbox of shading pattern should be used here? (see fillPath)
- graphics.draw(linePath);
+ if (isContentRendered())
+ {
+ graphics.draw(linePath);
+ }
linePath.reset();
}
@@ -790,11 +799,17 @@ public class PageDrawer extends PDFGraph
Area area = new Area(linePath);
area.intersect(new Area(graphics.getClip()));
intersectShadingBBox(getGraphicsState().getNonStrokingColor(), area);
- graphics.fill(area);
+ if (isContentRendered())
+ {
+ graphics.fill(area);
+ }
}
else
{
- graphics.fill(linePath);
+ if (isContentRendered())
+ {
+ graphics.fill(linePath);
+ }
}
linePath.reset();
@@ -1037,13 +1052,16 @@ public class PageDrawer extends PDFGraph
}
}
}
-
+
// draw the image
setClip();
graphics.setComposite(getGraphicsState().getNonStrokingJavaComposite());
- graphics.drawImage(renderedPaint,
- AffineTransform.getTranslateInstance(bounds.getMinX(), bounds.getMinY()),
- null);
+ if (isContentRendered())
+ {
+ graphics.drawImage(renderedPaint,
+ AffineTransform.getTranslateInstance(bounds.getMinX(), bounds.getMinY()),
+ null);
+ }
}
else
{
@@ -1125,7 +1143,10 @@ public class PageDrawer extends PDFGraph
awtPaint = applySoftMaskToPaint(awtPaint, softMask);
graphics.setPaint(awtPaint);
Rectangle2D unitRect = new Rectangle2D.Float(0, 0, 1, 1);
- graphics.fill(at.createTransformedShape(unitRect));
+ if (isContentRendered())
+ {
+ graphics.fill(at.createTransformedShape(unitRect));
+ }
}
else
{
@@ -1139,7 +1160,10 @@ public class PageDrawer extends PDFGraph
int height = image.getHeight();
imageTransform.scale(1.0 / width, -1.0 / height);
imageTransform.translate(0, -height);
- graphics.drawImage(image, imageTransform, null);
+ if (isContentRendered())
+ {
+ graphics.drawImage(image, imageTransform, null);
+ }
}
}
@@ -1251,11 +1275,17 @@ public class PageDrawer extends PDFGraph
{
Area bboxArea = new Area(bbox.transform(ctm));
bboxArea.intersect(getGraphicsState().getCurrentClippingPath());
- graphics.fill(bboxArea);
+ if (isContentRendered())
+ {
+ graphics.fill(bboxArea);
+ }
}
else
{
- graphics.fill(getGraphicsState().getCurrentClippingPath());
+ if (isContentRendered())
+ {
+ graphics.fill(getGraphicsState().getCurrentClippingPath());
+ }
}
}
@@ -1472,9 +1502,25 @@ public class PageDrawer extends PDFGraph
graphics.setStroke(oldStroke);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void showForm(PDFormXObject form) throws IOException
+ {
+ if (isContentRendered())
+ {
+ super.showForm(form);
+ }
+ }
+
@Override
public void showTransparencyGroup(PDTransparencyGroup form) throws IOException
{
+ if (!isContentRendered())
+ {
+ return;
+ }
TransparencyGroup group =
new TransparencyGroup(form, false, getGraphicsState().getCurrentTransformationMatrix(), null);
BufferedImage image = group.getImage();
@@ -1521,12 +1567,18 @@ public class PageDrawer extends PDFGraph
new Rectangle2D.Float(0, 0, image.getWidth(), image.getHeight()));
awtPaint = applySoftMaskToPaint(awtPaint, softMask);
graphics.setPaint(awtPaint);
- graphics.fill(
- new Rectangle2D.Float(0, 0, bbox.getWidth() * xScale, bbox.getHeight() * yScale));
+ if (isContentRendered())
+ {
+ graphics.fill(
+ new Rectangle2D.Float(0, 0, bbox.getWidth() * xScale, bbox.getHeight() * yScale));
+ }
}
else
{
- graphics.drawImage(image, null, null);
+ if (isContentRendered())
+ {
+ graphics.drawImage(image, null, null);
+ }
}
graphics.setTransform(prev);
@@ -1892,28 +1944,8 @@ public class PageDrawer extends PDFGraph
}
}
- private boolean isContentMarkOperator(Operator operator)
- {
- String name = operator.getName();
- return "BMC".equals(name) || "BDC".equals(name) || "EMC".equals(name);
- }
-
private boolean isContentRendered()
{
return nestedHiddenOCGCount <= 0;
}
-
- /**
- * Handle hidden optional content groups
- *
- * @see org.apache.pdfbox.contentstream.PDFStreamEngine#processOperator(Operator, List)
- */
- @Override
- protected void processOperator(Operator operator, List<COSBase> operands) throws IOException
- {
- if (isContentRendered() || isContentMarkOperator(operator))
- {
- super.processOperator(operator, operands);
- }
- }
}