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 2015/07/28 22:24:50 UTC
svn commit: r1693157 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Author: tilman
Date: Tue Jul 28 20:24:49 2015
New Revision: 1693157
URL: http://svn.apache.org/r1693157
Log:
PDFBOX-2899: collect text clip between BT and ET, and apply only if not empty
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1693157&r1=1693156&r2=1693157&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Tue Jul 28 20:24:49 2015
@@ -280,22 +280,25 @@ public class PageDrawer extends PDFGraph
public void beginText() throws IOException
{
setClip();
+ beginTextClip();
+ }
+
+ @Override
+ public void endText() throws IOException
+ {
+ endTextClip();
}
@Override
public void showTextString(byte[] string) throws IOException
{
- beginTextClip();
super.showTextString(string);
- endTextClip();
}
@Override
public void showTextStrings(COSArray array) throws IOException
{
- beginTextClip();
super.showTextStrings(array);
- endTextClip();
}
/**
@@ -303,14 +306,8 @@ public class PageDrawer extends PDFGraph
*/
private void beginTextClip()
{
- PDGraphicsState state = getGraphicsState();
- RenderingMode renderingMode = state.getTextState().getRenderingMode();
-
// buffer the text clip because it represents a single clipping area
- if (renderingMode.isClip())
- {
- textClippingArea = new Area();
- }
+ textClippingArea = new Area();
}
/**
@@ -322,7 +319,7 @@ public class PageDrawer extends PDFGraph
RenderingMode renderingMode = state.getTextState().getRenderingMode();
// apply the buffered clip as one area
- if (renderingMode.isClip())
+ if (renderingMode.isClip() && !textClippingArea.isEmpty())
{
state.intersectClippingPath(textClippingArea);
textClippingArea = null;