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/07/14 11:18:35 UTC
svn commit: r1863048 -
/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java
Author: tilman
Date: Sun Jul 14 11:18:34 2019
New Revision: 1863048
URL: http://svn.apache.org/viewvc?rev=1863048&view=rev
Log:
PDFBOX-4596: adjust transforms for rotation
Modified:
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java?rev=1863048&r1=1863047&r2=1863048&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java Sun Jul 14 11:18:34 2019
@@ -432,8 +432,7 @@ public class Overlay implements Closeabl
resources = new PDResources();
page.setResources(resources);
}
- COSName xObjectId = createOverlayXObject(page, layoutPage,
- layoutPage.overlayContentStream);
+ COSName xObjectId = createOverlayXObject(page, layoutPage, layoutPage.overlayContentStream);
array.add(createOverlayStream(page, layoutPage, xObjectId));
}
@@ -478,7 +477,25 @@ public class Overlay implements Closeabl
xobjForm.setResources(new PDResources(layoutPage.overlayResources));
xobjForm.setFormType(1);
xobjForm.setBBox(layoutPage.overlayMediaBox.createRetranslatedRectangle());
- xobjForm.setMatrix(new AffineTransform());
+ AffineTransform at = new AffineTransform();
+ switch (layoutPage.overlayRotation)
+ {
+ case 90:
+ at.translate(0, layoutPage.overlayMediaBox.getWidth());
+ at.rotate(Math.toRadians(-90));
+ break;
+ case 180:
+ at.translate(layoutPage.overlayMediaBox.getWidth(), layoutPage.overlayMediaBox.getHeight());
+ at.rotate(Math.toRadians(-180));
+ break;
+ case 270:
+ at.translate(layoutPage.overlayMediaBox.getHeight(), 0);
+ at.rotate(Math.toRadians(-270));
+ break;
+ default:
+ break;
+ }
+ xobjForm.setMatrix(at);
PDResources resources = page.getResources();
return resources.add(xobjForm, "OL");
}
@@ -489,7 +506,15 @@ public class Overlay implements Closeabl
// create a new content stream that executes the XObject content
StringBuilder overlayStream = new StringBuilder();
overlayStream.append("q\nq\n");
- AffineTransform at = calculateAffineTransform(page, layoutPage.overlayMediaBox);
+ PDRectangle overlayMediaBox = new PDRectangle(layoutPage.overlayMediaBox.getCOSArray());
+ if (layoutPage.overlayRotation == 90 || layoutPage.overlayRotation == 270)
+ {
+ overlayMediaBox.setLowerLeftX(layoutPage.overlayMediaBox.getLowerLeftY());
+ overlayMediaBox.setLowerLeftY(layoutPage.overlayMediaBox.getLowerLeftX());
+ overlayMediaBox.setUpperRightX(layoutPage.overlayMediaBox.getUpperRightY());
+ overlayMediaBox.setUpperRightY(layoutPage.overlayMediaBox.getUpperRightX());
+ }
+ AffineTransform at = calculateAffineTransform(page, overlayMediaBox);
double[] flatmatrix = new double[6];
at.getMatrix(flatmatrix);
for (double v : flatmatrix)
@@ -497,7 +522,13 @@ public class Overlay implements Closeabl
overlayStream.append(float2String((float) v));
overlayStream.append(" ");
}
- overlayStream.append(" cm\n/");
+ overlayStream.append(" cm\n");
+
+ // if debugging, insert
+ // 0 0 overlayMediaBox.getHeight() overlayMediaBox.getWidth() re\ns\n
+ // into the content stream
+
+ overlayStream.append(" /");
overlayStream.append(xObjectId.getName());
overlayStream.append(" Do Q\nQ\n");
return createStream(overlayStream.toString());