Author: acumiskey
Date: Wed Aug 20 06:00:43 2008
New Revision: 687307
URL: http://svn.apache.org/viewvc?rev=687307&view=rev
Log:
Merged revisions 685918,687305 via svnmerge from
https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r685918 | jeremias | 2008-08-14 15:32:28 +0100 (Thu, 14 Aug 2008) | 1 line
Wasn't an NPE, but actually a division by zero.
........
r687305 | acumiskey | 2008-08-20 13:59:11 +0100 (Wed, 20 Aug 2008) | 2 lines
Moved mptToPt() and ptToMpt() from AbstractRenderer to UnitConv. One less
dependency to worry about.
........
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/UnitConv.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 20 06:00:43 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-685885
+/xmlgraphics/fop/trunk:1-687306
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
Wed Aug 20 06:00:43 2008
@@ -48,6 +48,7 @@
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.traits.BorderProps;
+import org.apache.fop.util.UnitConv;
/**
* Abstract base class for renderers like PDF and PostScript where many
painting operations
@@ -519,7 +520,7 @@
saveGraphicsState();
//Viewport position
- concatenateTransformationMatrix(mptToPt(positionTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(positionTransform));
//Background and borders
float bpwidth = (borderPaddingStart +
bv.getBorderAndPaddingWidthEnd()) / 1000f;
@@ -529,7 +530,7 @@
//Shift to content rectangle after border painting
AffineTransform contentRectTransform = new AffineTransform();
contentRectTransform.translate(borderPaddingStart,
borderPaddingBefore);
- concatenateTransformationMatrix(mptToPt(contentRectTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(contentRectTransform));
//Clipping
if (bv.getClip()) {
@@ -539,7 +540,7 @@
saveGraphicsState();
//Set up coordinate system for content rectangle
AffineTransform contentTransform = ctm.toAffineTransform();
- concatenateTransformationMatrix(mptToPt(contentTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(contentTransform));
currentIPPosition = 0;
currentBPPosition = 0;
@@ -603,7 +604,7 @@
if (!at.isIdentity()) {
saveGraphicsState();
- concatenateTransformationMatrix(mptToPt(at));
+ concatenateTransformationMatrix(UnitConv.mptToPt(at));
}
currentIPPosition = 0;
@@ -636,7 +637,7 @@
if (!at.isIdentity()) {
saveGraphicsState();
- concatenateTransformationMatrix(mptToPt(at));
+ concatenateTransformationMatrix(UnitConv.mptToPt(at));
}
currentIPPosition = 0;
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java
Wed Aug 20 06:00:43 2008
@@ -21,7 +21,6 @@
// Java
import java.awt.Rectangle;
-import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.io.OutputStream;
@@ -836,32 +835,4 @@
public String getMimeType() {
return null;
}
-
- /**
- * Converts a millipoint-based transformation matrix to points.
- * @param at a millipoint-based transformation matrix
- * @return a point-based transformation matrix
- */
- protected AffineTransform mptToPt(AffineTransform at) {
- double[] matrix = new double[6];
- at.getMatrix(matrix);
- //Convert to points
- matrix[4] = matrix[4] / 1000;
- matrix[5] = matrix[5] / 1000;
- return new AffineTransform(matrix);
- }
-
- /**
- * Converts a point-based transformation matrix to millipoints.
- * @param at a point-based transformation matrix
- * @return a millipoint-based transformation matrix
- */
- protected AffineTransform ptToMpt(AffineTransform at) {
- double[] matrix = new double[6];
- at.getMatrix(matrix);
- //Convert to millipoints
- matrix[4] = matrix[4] * 1000;
- matrix[5] = matrix[5] * 1000;
- return new AffineTransform(matrix);
- }
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Wed Aug 20 06:00:43 2008
@@ -968,7 +968,7 @@
saveGraphicsState();
//Viewport position
- concatenateTransformationMatrix(mptToPt(positionTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(positionTransform));
//Background and borders
float bpwidth = (borderPaddingStart +
bv.getBorderAndPaddingWidthEnd()) / 1000f;
@@ -978,7 +978,7 @@
//Shift to content rectangle after border painting
AffineTransform contentRectTransform = new AffineTransform();
contentRectTransform.translate(borderPaddingStart,
borderPaddingBefore);
- concatenateTransformationMatrix(mptToPt(contentRectTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(contentRectTransform));
//Clipping
if (bv.getClip()) {
@@ -988,7 +988,7 @@
saveGraphicsState();
//Set up coordinate system for content rectangle
AffineTransform contentTransform = ctm.toAffineTransform();
- concatenateTransformationMatrix(mptToPt(contentTransform));
+
concatenateTransformationMatrix(UnitConv.mptToPt(contentTransform));
currentIPPosition = 0;
currentBPPosition = 0;
@@ -1058,7 +1058,7 @@
if (!at.isIdentity()) {
saveGraphicsState();
- concatenateTransformationMatrix(mptToPt(at));
+ concatenateTransformationMatrix(UnitConv.mptToPt(at));
}
currentIPPosition = 0;
@@ -1096,7 +1096,7 @@
if (!at.isIdentity()) {
saveGraphicsState();
- concatenateTransformationMatrix(mptToPt(at));
+ concatenateTransformationMatrix(UnitConv.mptToPt(at));
}
currentIPPosition = 0;
@@ -1119,7 +1119,7 @@
*/
protected void concatenateTransformationMatrix(AffineTransform at) {
if (!at.isIdentity()) {
- graphicContext.transform(ptToMpt(at));
+ graphicContext.transform(UnitConv.ptToMpt(at));
changePrintDirection();
}
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/txt/TXTRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/txt/TXTRenderer.java
Wed Aug 20 06:00:43 2008
@@ -37,6 +37,7 @@
import org.apache.fop.render.AbstractPathOrientedRenderer;
import org.apache.fop.render.txt.border.AbstractBorderElement;
import org.apache.fop.render.txt.border.BorderManager;
+import org.apache.fop.util.UnitConv;
/**
* Renderer that renders areas to plain text.
@@ -570,7 +571,7 @@
/** [EMAIL PROTECTED] */
protected void concatenateTransformationMatrix(AffineTransform at) {
- currentState.push(new CTM(ptToMpt(at)));
+ currentState.push(new CTM(UnitConv.ptToMpt(at)));
}
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/UnitConv.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/UnitConv.java?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/UnitConv.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/util/UnitConv.java
Wed Aug 20 06:00:43 2008
@@ -19,6 +19,8 @@
package org.apache.fop.util;
+import java.awt.geom.AffineTransform;
+
/**
* Utility class for unit conversions.
*/
@@ -125,4 +127,32 @@
return mpt2in(mpt) * resolution;
}
+ /**
+ * Converts a millipoint-based transformation matrix to points.
+ * @param at a millipoint-based transformation matrix
+ * @return a point-based transformation matrix
+ */
+ public static AffineTransform mptToPt(AffineTransform at) {
+ double[] matrix = new double[6];
+ at.getMatrix(matrix);
+ //Convert to points
+ matrix[4] = matrix[4] / 1000;
+ matrix[5] = matrix[5] / 1000;
+ return new AffineTransform(matrix);
+ }
+
+ /**
+ * Converts a point-based transformation matrix to millipoints.
+ * @param at a point-based transformation matrix
+ * @return a millipoint-based transformation matrix
+ */
+ public static AffineTransform ptToMpt(AffineTransform at) {
+ double[] matrix = new double[6];
+ at.getMatrix(matrix);
+ //Convert to millipoints
+ matrix[4] = matrix[4] * 1000;
+ matrix[5] = matrix[5] * 1000;
+ return new AffineTransform(matrix);
+ }
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml?rev=687307&r1=687306&r2=687307&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml Wed Aug 20
06:00:43 2008
@@ -54,7 +54,7 @@
<changes>
<release version="FOP Trunk" date="TBD">
<action context="Layout" dev="JM" type="fix">
- Fixed the source for a NullPointerException when the content of an
fo:leader with
+ Fixed the source for a division by zero when the content of an
fo:leader with
leader-pattern="use-content" collapses to zero width during layout.
</action>
<action context="Renderers" dev="JM" type="fix">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
