Add new addFilledRect method to make it possible to draw filled rectangles without any stroke in PDF; in doFrame, use rectangles instead of lines for borders to eliminate pixel errors

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

2 files changed, 70 insertions, 18 deletions

diff --git a/src/org/apache/fop/render/PrintRenderer.java b/src/org/apache/fop/render/PrintRenderer.java
index 21094a881..f4cc8fc7d 100644
--- a/src/org/apache/fop/render/PrintRenderer.java
+++ b/src/org/apache/fop/render/PrintRenderer.java
@@ -142,7 +142,7 @@ public abstract class PrintRenderer implements Renderer
                            PDFPathPaint stroke);
 
     /**
-       * add a filled rectangle to the current stream
+       * add a filled and stroked rectangle to the current stream
        *
        * @param x the x position of left edge in millipoints
        * @param y the y position of top edge in millipoints
@@ -155,6 +155,22 @@ public abstract class PrintRenderer implements Renderer
                            PDFPathPaint stroke, PDFPathPaint fill);
 
     /**
+       * Add a filled rectangle to the current stream
+       * This default implementation calls addRect
+       * using the same color for fill and border.
+       *
+       * @param x the x position of left edge in millipoints
+       * @param y the y position of top edge in millipoints
+       * @param w the width in millipoints
+       * @param h the height in millipoints
+       * @param fill the fill color/gradient
+       */
+    protected void addFilledRect(int x, int y, int w, int h,
+                            PDFPathPaint fill) {
+	addRect(x,y,w,h,fill,fill);
+    }
+
+    /**
        * render area container
        *
        * @param area the area container to render
@@ -174,8 +190,8 @@ public abstract class PrintRenderer implements Renderer
         } else if (area.getPosition() == Position.STATIC) {
             this.currentYPosition -=
               area.getPaddingTop() + area.getBorderTopWidth();
-            this.currentAreaContainerXPosition +=
-              area.getPaddingLeft() + area.getBorderLeftWidth();
+	    /*     this.currentAreaContainerXPosition +=
+		   area.getPaddingLeft() + area.getBorderLeftWidth();*/
         }
 
         this.currentXPosition = this.currentAreaContainerXPosition;
@@ -274,7 +290,7 @@ public abstract class PrintRenderer implements Renderer
         // I'm not sure I should have to check for bg being null
         // but I do
         if ((bg != null) && (bg.alpha() == 0)) {
-            this.addRect(rx, ry, w, -h, new PDFColor(bg), new PDFColor(bg));
+            this.addFilledRect(rx, ry, w, -h, new PDFColor(bg));
         }
 
         //rx = rx - area.getBorderLeftWidth();
@@ -285,23 +301,41 @@ public abstract class PrintRenderer implements Renderer
 	// Handle line style
 	// Offset for haft the line width!
 	BorderAndPadding bp = area.getBorderAndPadding();
-	int left = rx - area.getBorderLeftWidth() / 2;
-	int right = rx + w + area.getBorderRightWidth() / 2;
-	int top = ry + area.getBorderTopWidth() / 2;
-	int bottom = ry - h - area.getBorderBottomWidth() / 2;
-        if (area.getBorderTopWidth() != 0)
-            addLine(left, top, right, top, area.getBorderTopWidth(),
+// 	int left = rx - area.getBorderLeftWidth() / 2;
+// 	int right = rx + w + area.getBorderRightWidth() / 2;
+// 	int top = ry + area.getBorderTopWidth() / 2;
+// 	int bottom = ry - h - area.getBorderBottomWidth() / 2;
+//         if (area.getBorderTopWidth() != 0)
+//             addLine(left, top, right, top, area.getBorderTopWidth(),
+//                     new PDFColor(bp.getBorderColor(BorderAndPadding.TOP)));
+//         if (area.getBorderLeftWidth() != 0)
+//             addLine(left, ry + area.getBorderTopWidth(), left, bottom, area.getBorderLeftWidth(),
+//                     new PDFColor(bp.getBorderColor(BorderAndPadding.LEFT)));
+//         if (area.getBorderRightWidth() != 0)
+//             addLine(right, ry + area.getBorderTopWidth(), right, bottom, area.getBorderRightWidth(),
+//                     new PDFColor(bp.getBorderColor(BorderAndPadding.RIGHT)));
+//         if (area.getBorderBottomWidth() != 0)
+//             addLine(rx - area.getBorderLeftWidth(), bottom, rx + w + area.getBorderRightWidth(), bottom, area.getBorderBottomWidth(),
+//                     new PDFColor(bp.getBorderColor(BorderAndPadding.BOTTOM)));
+	// Try using rectangles instead of lines. Line style will be a
+	// problem though?
+	int left = area.getBorderLeftWidth();
+	int right = area.getBorderRightWidth();
+	int top = area.getBorderTopWidth();
+	int bottom = area.getBorderBottomWidth() ;
+	// If style is solid, use filled rectangles
+        if (top != 0)
+            addFilledRect(rx, ry, w, top,
                     new PDFColor(bp.getBorderColor(BorderAndPadding.TOP)));
-        if (area.getBorderLeftWidth() != 0)
-            addLine(left, ry + area.getBorderTopWidth(), left, bottom, area.getBorderLeftWidth(),
+        if (left != 0)
+            addFilledRect(rx-left, ry-h-bottom, left, h+top+bottom,
                     new PDFColor(bp.getBorderColor(BorderAndPadding.LEFT)));
-        if (area.getBorderRightWidth() != 0)
-            addLine(right, ry + area.getBorderTopWidth(), right, bottom, area.getBorderRightWidth(),
+        if (right != 0)
+            addFilledRect(rx+w, ry-h-bottom, right, h+top+bottom,
                     new PDFColor(bp.getBorderColor(BorderAndPadding.RIGHT)));
-        if (area.getBorderBottomWidth() != 0)
-            addLine(rx - area.getBorderLeftWidth(), bottom, rx + w + area.getBorderRightWidth(), bottom, area.getBorderBottomWidth(),
+        if (bottom != 0)
+            addFilledRect(rx, ry-h-bottom, w, bottom,
                     new PDFColor(bp.getBorderColor(BorderAndPadding.BOTTOM)));
-
     }
 
 
diff --git a/src/org/apache/fop/render/pdf/PDFRenderer.java b/src/org/apache/fop/render/pdf/PDFRenderer.java
index 468e82e3c..6af1e9a0e 100644
--- a/src/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/org/apache/fop/render/pdf/PDFRenderer.java
@@ -218,13 +218,31 @@ public class PDFRenderer extends PrintRenderer {
     protected void addRect(int x, int y, int w, int h,
                            PDFPathPaint stroke, PDFPathPaint fill) {
         closeText();
-        currentStream.add("ET\nq\n" + fill.getColorSpaceOut(true) +
+	currentStream.add("ET\nq\n" + fill.getColorSpaceOut(true) +
                           stroke.getColorSpaceOut(false) + (x / 1000f) + " " +
                           (y / 1000f) + " " + (w / 1000f) + " " + (h / 1000f) +
                           " re b\n" + "Q\nBT\n");
     }
 
     /**
+       * add a filled rectangle to the current stream
+       *
+       * @param x the x position of left edge in millipoints
+       * @param y the y position of top edge in millipoints
+       * @param w the width in millipoints
+       * @param h the height in millipoints
+       * @param fill the fill color/gradient
+       */
+    protected void addFilledRect(int x, int y, int w, int h,
+                            PDFPathPaint fill) {
+        closeText();
+	currentStream.add("ET\nq\n" + fill.getColorSpaceOut(true) +
+                          (x / 1000f) + " " +
+                          (y / 1000f) + " " + (w / 1000f) + " " + (h / 1000f) +
+                          " re f\n" + "Q\nBT\n");
+    }
+
+    /**
      * render image area to PDF
      *
      * @param area the image area to render