FOP-2620: AFP round table border not aligned

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

2 files changed, 41 insertions, 3 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
index d3801c119..b354da477 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
@@ -110,9 +110,8 @@ public abstract class AFPImageHandler implements ImageHandlerBase {
 
         int[] coords = unitConv.mpts2units(new float[] {targetRect.x, targetRect.y});
 
-        int width = Math.round(unitConv.mpt2units(targetRect.width));
-
-        int height = Math.round(unitConv.mpt2units(targetRect.height));
+        int width = (int) Math.ceil(unitConv.mpt2units(targetRect.width));
+        int height = (int) Math.ceil(unitConv.mpt2units(targetRect.height));
 
         int resolution = paintingState.getResolution();
         AFPObjectAreaInfo objectAreaInfo = new AFPObjectAreaInfo(coords[X], coords[Y], width,
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java
new file mode 100644
index 000000000..802474cab
--- /dev/null
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.render.afp;
+
+import java.awt.Rectangle;
+
+import org.junit.Test;
+
+import org.apache.fop.afp.AFPObjectAreaInfo;
+import org.apache.fop.afp.AFPPaintingState;
+
+import junit.framework.Assert;
+
+public class AFPImageHandlerTestCase {
+
+    @Test
+    public void testAFPImageHandlerSize() {
+        AFPObjectAreaInfo areaInfo = AFPImageHandler.createObjectAreaInfo(new AFPPaintingState(),
+                new Rectangle(0, 0, 1000, 1000));
+        Assert.assertEquals(areaInfo.getHeight(), 4);
+    }
+}