svn commit: r1636680 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java

[tilman]

Author: tilman
Date: Tue Nov  4 18:32:16 2014
New Revision: 1636680

URL: http://svn.apache.org/r1636680
Log:
PDFBOX-2481: padding at the end of each row

Modified:
    
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java

Modified: 
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java?rev=1636680&r1=1636679&r2=1636680&view=diff
==============================================================================
--- 
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
 (original)
+++ 
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
 Tue Nov  4 18:32:16 2014
@@ -40,7 +40,6 @@ import org.apache.pdfbox.pdmodel.common.
 import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
 import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
 import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
 import org.apache.pdfbox.pdmodel.graphics.color.PDIndexed;
 import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
 import org.apache.pdfbox.util.ImageIOUtil;
@@ -172,11 +171,11 @@ public class PDPixelMap extends PDXObjec
                             // grayscale images need one color per sample
                             mcios.writeBits(bi.getRGB(x, y) & 0xFF, bpc);
                         }
-                    }
-                    // padding
-                    while (mcios.getBitOffset() != 0)
-                    {
-                        mcios.writeBit(0);
+                        // padding
+                        while (mcios.getBitOffset() != 0)
+                        {
+                            mcios.writeBit(0);
+                        }
                     }
                     mcios.flush();
                     mcios.close();
@@ -269,7 +268,7 @@ public class PDPixelMap extends PDXObjec
                 return null;
             }
             // Get the ColorModel right
-            ColorModel cm = null;
+            ColorModel cm;
             if (colorspace instanceof PDIndexed)
             {
                 PDIndexed csIndexed = (PDIndexed)colorspace;
@@ -328,7 +327,7 @@ public class PDPixelMap extends PDXObjec
             }
             else if (bpc == 1)
             {
-                byte[] map = null;
+                byte[] map;
                 if (colorspace instanceof PDDeviceGray)
                 {
                     COSArray decode = getDecode();