Bugzilla #47311:

Preparations in PDF library for bleed, trim and crop boxes.
Submitted by: Peter Coppens <pc.subscriptions.at.gmail.com>

Page view area changed from Rectangle2D to Rectangle where possible.
Submitted by: Vincent Hennebert <vhennebert.at.apache.org>

(Patch in Bugzilla only partially applied. Changes discussed with the properties not included, yet)



git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@798511 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/render/pdf/PDFEventProducer.java b/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
index 2c3be9736..d70409870 100644
--- a/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
@@ -30,7 +30,12 @@ import org.apache.fop.events.model.EventModel;
 public interface PDFEventProducer extends EventProducer {
 
     /** Provider class for the event producer. */
-    class Provider {
+    final class Provider {
+
+        /**
+         * Utility classes should not have a public or default constructor.
+         */
+        private Provider() { }
 
         /**
          * Returns an event producer.
diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index c40c94fc4..3b737150b 100644
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -457,9 +457,8 @@ public class PDFRenderer extends AbstractPathOrientedRenderer implements PDFConf
         }
         currentPageRef = currentPage.referencePDF();
 
-        Rectangle2D bounds = page.getViewArea();
-        double h = bounds.getHeight();
-        pageHeight = (int) h;
+        Rectangle bounds = page.getViewArea();
+        pageHeight = bounds.height;
 
         this.generator = new PDFContentGenerator(this.pdfDoc, this.ostream, this.currentPage);
         this.borderPainter = new PDFBorderPainter(this.generator);