Author: vhennebert
Date: Tue Jul 28 13:45:56 2009
New Revision: 798521
URL: http://svn.apache.org/viewvc?rev=798521&view=rev
Log:
Also use Rectangle instead of Rectangle2D for page boxes in the PDF library
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=798521&r1=798520&r2=798521&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Tue Jul
28 13:45:56 2009
@@ -20,6 +20,7 @@
package org.apache.fop.pdf;
// Java
+import java.awt.Rectangle;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.io.FileNotFoundException;
@@ -183,8 +184,8 @@
* @return the created /Page object
*/
public PDFPage makePage(PDFResources resources, int pageIndex,
- Rectangle2D mediaBox, Rectangle2D cropBox,
- Rectangle2D bleedBox, Rectangle2D trimBox) {
+ Rectangle mediaBox, Rectangle cropBox,
+ Rectangle bleedBox, Rectangle trimBox) {
PDFPage page = new PDFPage(resources, pageIndex, mediaBox, cropBox,
bleedBox, trimBox);
getDocument().assignObjectNumber(page);
@@ -206,7 +207,7 @@
*/
public PDFPage makePage(PDFResources resources,
int pageWidth, int pageHeight, int pageIndex) {
- Rectangle2D mediaBox = new Rectangle2D.Double(0, 0, pageWidth,
pageHeight);
+ Rectangle mediaBox = new Rectangle(0, 0, pageWidth, pageHeight);
return makePage(resources, pageIndex, mediaBox, mediaBox, mediaBox,
mediaBox);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java?rev=798521&r1=798520&r2=798521&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPage.java Tue Jul 28
13:45:56 2009
@@ -19,7 +19,7 @@
package org.apache.fop.pdf;
-import java.awt.geom.Rectangle2D;
+import java.awt.Rectangle;
/**
* Class representing a /Page object.
@@ -45,8 +45,8 @@
* @param trimBox the TrimBox. If null, bleedBox is used.
*/
public PDFPage(PDFResources resources, int pageIndex,
- Rectangle2D mediaBox, Rectangle2D cropBox,
- Rectangle2D bleedBox, Rectangle2D trimBox) {
+ Rectangle mediaBox, Rectangle cropBox,
+ Rectangle bleedBox, Rectangle trimBox) {
/* generic creation of object */
super(resources);
@@ -56,8 +56,8 @@
this.pageIndex = pageIndex;
}
- private void setSimplePageSize(Rectangle2D mediaBox, Rectangle2D cropBox,
- Rectangle2D bleedBox, Rectangle2D trimBox) {
+ private void setSimplePageSize(Rectangle mediaBox, Rectangle cropBox,
+ Rectangle bleedBox, Rectangle trimBox) {
setMediaBox(mediaBox);
if (cropBox == null) {
@@ -76,16 +76,16 @@
setTrimBox(trimBox); //Needed for PDF/X
}
- private PDFArray toPDFArray(Rectangle2D box) {
- return new PDFArray(this, new double[] {
- box.getX(), box.getY(), box.getMaxX(), box.getMaxY()});
+ private PDFArray toPDFArray(Rectangle box) {
+ return new PDFArray(this, new int[] {
+ box.x, box.y, box.x + box.width, box.y + box.height});
}
/**
* Sets the "MediaBox" entry
* @param box the media rectangle
*/
- public void setMediaBox(Rectangle2D box) {
+ public void setMediaBox(Rectangle box) {
put("MediaBox", toPDFArray(box));
}
@@ -93,7 +93,7 @@
* Sets the "CropBox" entry
* @param box the bleed rectangle
*/
- public void setCropBox(Rectangle2D box) {
+ public void setCropBox(Rectangle box) {
put("CropBox", toPDFArray(box));
}
@@ -101,7 +101,7 @@
* Sets the "BleedBox" entry
* @param box the bleed rectangle
*/
- public void setBleedBox(Rectangle2D box) {
+ public void setBleedBox(Rectangle box) {
put("BleedBox", toPDFArray(box));
}
@@ -109,7 +109,7 @@
* Sets the "TrimBox" entry
* @param box the trim rectangle
*/
- public void setTrimBox(Rectangle2D box) {
+ public void setTrimBox(Rectangle box) {
put("TrimBox", toPDFArray(box));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
