You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2010/04/26 13:26:08 UTC
svn commit: r938005 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
src/java/org/apache/fop/render/pdf/PDFRenderer.java
src/java/org/apache/fop/util/AbstractPaintingState.java status.xml
Author: jeremias
Date: Mon Apr 26 11:26:08 2010
New Revision: 938005
URL: http://svn.apache.org/viewvc?rev=938005&view=rev
Log:
Added a save/restoreGraphicsState pair for the initial coordinate system in PDF output for easier post-processing. The missing q/Q pair caused content to be upside-down when simply a new content stream is appended to the page. With this change the initial coordinate system is restored after FOP's stream is finished.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=938005&r1=938004&r2=938005&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Mon Apr 26 11:26:08 2010
@@ -245,6 +245,7 @@ public class PDFDocumentHandler extends
AffineTransform basicPageTransform = new AffineTransform(1, 0, 0, -1, 0,
(scaleY * size.height) / 1000f);
basicPageTransform.scale(scaleX, scaleY);
+ generator.saveGraphicsState();
generator.concatenate(basicPageTransform);
}
@@ -259,7 +260,8 @@ public class PDFDocumentHandler extends
/** {@inheritDoc} */
public void endPageContent() throws IFException {
- //nop
+ generator.restoreGraphicsState();
+ //for top-level transform to change the default coordinate system
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=938005&r1=938004&r2=938005&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Mon Apr 26 11:26:08 2010
@@ -495,16 +495,14 @@ public class PDFRenderer extends Abstrac
this.borderPainter = new PDFBorderPainter(this.generator);
// Transform the PDF's default coordinate system (0,0 at lower left) to the PDFRenderer's
+ saveGraphicsState();
AffineTransform basicPageTransform = new AffineTransform(1, 0, 0, -1, 0,
pageHeight / 1000f);
generator.concatenate(basicPageTransform);
- /*
- currentState.concatenate(basicPageTransform);
- currentStream.add(CTMHelper.toPDFString(basicPageTransform, false) + " cm\n");
- */
super.renderPage(page);
+ restoreGraphicsState();
if (accessEnabled) {
logicalStructureHandler.endPage();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java?rev=938005&r1=938004&r2=938005&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java Mon Apr 26 11:26:08 2010
@@ -513,6 +513,9 @@ public abstract class AbstractPaintingSt
data.fontSize = this.fontSize;
data.lineWidth = this.lineWidth;
data.dashArray = this.dashArray;
+ if (this.transform == null) {
+ this.transform = new AffineTransform();
+ }
data.transform = new AffineTransform(this.transform);
return data;
}
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=938005&r1=938004&r2=938005&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Apr 26 11:26:08 2010
@@ -58,6 +58,10 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="JM" type="fix">
+ Added a save/restoreGraphicsState pair for the initial coordinate system in PDF output
+ for easier post-processing.
+ </action>
<action context="Images" dev="JM" type="add">
Added customization ability for the image loading framework from FOP's configuration file.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org