svn commit: r1621864 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java

[ja...@apache.org]

Author: jahewson
Date: Mon Sep  1 18:30:19 2014
New Revision: 1621864

URL: http://svn.apache.org/r1621864
Log:
PDFBOX-1094: Avoid floating point error in Math.ceil

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java?rev=1621864&r1=1621863&r2=1621864&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/TilingPaint.java Mon Sep  1 18:30:19 2014
@@ -29,8 +29,9 @@ import java.awt.image.ComponentColorMode
 import java.awt.image.DataBuffer;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -49,11 +50,6 @@ import org.apache.pdfbox.util.Matrix;
 public class TilingPaint extends TexturePaint
 {
     /**
-     * Logger instance.
-     */
-    private static final Log LOG = LogFactory.getLog(TilingPaint.class);
-
-    /**
      * Creates a new colored tiling Paint.
      *
      * @param pattern tiling pattern dictionary
@@ -140,8 +136,8 @@ public class TilingPaint extends Texture
         float width = (float)rect.getWidth();
         float height = (float)rect.getHeight();
 
-        int rasterWidth = Math.max(1, (int)Math.ceil(width * Math.abs(xform.getScaleX())));
-        int rasterHeight = Math.max(1, (int)Math.ceil(height * Math.abs(xform.getScaleY())));
+        int rasterWidth = Math.max(1, ceiling(width * Math.abs(xform.getScaleX())));
+        int rasterHeight = Math.max(1, ceiling(height * Math.abs(xform.getScaleY())));
 
         // create raster
         WritableRaster raster = cm.createCompatibleWritableRaster(rasterWidth, rasterHeight);
@@ -169,6 +165,17 @@ public class TilingPaint extends Texture
         return image;
     }
 
+    /**
+     * Returns the closest integer which is larger than the given number.
+     * Uses BigDecimal to avoid floating point error which would cause gaps in the tiling.
+     */
+    private static int ceiling(double num)
+    {
+        BigDecimal decimal = new BigDecimal(num);
+        decimal.setScale(5, RoundingMode.CEILING); // 5 decimal places of accuracy
+        return decimal.intValue();
+    }
+
     @Override
     public int getTransparency()
     {