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 2014/08/22 18:11:12 UTC
svn commit: r1619855 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
Author: tilman
Date: Fri Aug 22 16:11:12 2014
New Revision: 1619855
URL: http://svn.apache.org/r1619855
Log:
PDFBOX-2277: revert previous commit (except cleanup)
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=1619855&r1=1619854&r2=1619855&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java Fri Aug 22 16:11:12 2014
@@ -156,39 +156,8 @@ public class PageDrawer extends PDFStrea
{
PDAppearanceStream appearance =
(PDAppearanceStream)appearanceMap.get( appearanceName );
- if (appearance != null)
- {
- // save the graphics state
- getGraphicsStack().push((PDGraphicsState) getGraphicsState().clone());
- if (appearance.getBoundingBox() != null)
- {
- PDGraphicsState graphicsState = getGraphicsState();
- PDRectangle bBox = appearance.getBoundingBox();
-
- float x1 = bBox.getLowerLeftX();
- float y1 = bBox.getLowerLeftY();
- float x2 = bBox.getUpperRightX();
- float y2 = bBox.getUpperRightY();
-
- Point2D p0 = transformedPoint(x1, y1);
- Point2D p1 = transformedPoint(x2, y1);
- Point2D p2 = transformedPoint(x2, y2);
- Point2D p3 = transformedPoint(x1, y2);
-
- GeneralPath bboxPath = new GeneralPath();
- bboxPath.moveTo((float) p0.getX(), (float) p0.getY());
- bboxPath.lineTo((float) p1.getX(), (float) p1.getY());
- bboxPath.lineTo((float) p2.getX(), (float) p2.getY());
- bboxPath.lineTo((float) p3.getX(), (float) p3.getY());
- bboxPath.closePath();
-
- Area resultClippingArea = new Area(graphicsState.getCurrentClippingPath());
- Area newArea = new Area(bboxPath);
- resultClippingArea.intersect(newArea);
-
- graphicsState.setCurrentClippingPath(resultClippingArea);
- }
-
+ if( appearance != null )
+ {
Point2D point = new Point2D.Float(rect.getLowerLeftX(), rect.getLowerLeftY());
Matrix matrix = appearance.getMatrix();
if (matrix != null)
@@ -200,9 +169,6 @@ public class PageDrawer extends PDFStrea
g.translate( (int)point.getX(), -(int)point.getY() );
processSubStream( page, appearance.getResources(), appearance.getStream() );
g.translate( -(int)point.getX(), (int)point.getY() );
-
- // restore the graphics state
- setGraphicsState((PDGraphicsState) getGraphicsStack().pop());
}
}
}