You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by da...@apache.org on 2009/04/30 14:07:48 UTC

svn commit: r770181 - in /incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox: cos/ pdfviewer/ pdmodel/graphics/color/ pdmodel/graphics/xobject/ util/ util/operator/ util/operator/pagedrawer/

Author: danielwilson
Date: Thu Apr 30 12:07:48 2009
New Revision: 770181

URL: http://svn.apache.org/viewvc?rev=770181&view=rev
Log:
Eliminate the <TAB> characters I introduced.

Modified:
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSArray.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java
    incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSArray.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSArray.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSArray.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSArray.java Thu Apr 30 12:07:48 2009
@@ -480,14 +480,14 @@
     }
     
     /*
-	Return contents of COSArray as a Java List
+    Return contents of COSArray as a Java List
     */
     public List toList()
     {
-	    ArrayList retList = new ArrayList(size());
-	    for (int i = 0; i < size(); i++)
-		retList.add(get(i));
-	    
-	    return retList;
+        ArrayList retList = new ArrayList(size());
+        for (int i = 0; i < size(); i++)
+        retList.add(get(i));
+        
+        return retList;
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java Thu Apr 30 12:07:48 2009
@@ -86,8 +86,8 @@
         graphics.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
         // Only if there is some content, we have to process it. Otherwise we are done here and we will produce an empty page
         if ( page.getContents() != null) {
-        	PDResources resources = page.findResources();
-        	processStream( page, resources, page.getContents().getStream() );
+            PDResources resources = page.findResources();
+            processStream( page, resources, page.getContents().getStream() );
         }
         List annotations = page.getAnnotations();
         for( int i=0; i<annotations.size(); i++ )
@@ -153,9 +153,9 @@
             }
             else
             {
-            	// TODO: need to implement....
-            	logger().warning("Unsupported RenderingMode "+this.getGraphicsState().getTextState().getRenderingMode()+" in PageDrawer.processTextPosition()");
-            	logger().warning("Using RenderingMode "+PDTextState.RENDERING_MODE_FILL_TEXT+" instead");
+                // TODO: need to implement....
+                logger().warning("Unsupported RenderingMode "+this.getGraphicsState().getTextState().getRenderingMode()+" in PageDrawer.processTextPosition()");
+                logger().warning("Using RenderingMode "+PDTextState.RENDERING_MODE_FILL_TEXT+" instead");
                 graphics.setColor( this.getGraphicsState().getNonStrokingColorSpace().createColor() );
             }
             PDFont font = text.getFont();
@@ -164,7 +164,7 @@
             float x = textPos.getXPosition();
             // the 0,0-reference has to be moved from the lower left (PDF) to the upper left (AWT-graphics)
             float y = pageSize.height - textPos.getYPosition();
-    		// Set translation to 0,0. We only need the scaling and shearing
+            // Set translation to 0,0. We only need the scaling and shearing
             textPos.setValue(2, 0, 0);
             textPos.setValue(2, 1, 0);
             // because of the moved 0,0-reference, we have to shear in the opposite direction
@@ -219,7 +219,7 @@
      */
     public double fixY( double x, double y )
     {
-    	return pageSize.getHeight() - y;
+        return pageSize.getHeight() - y;
     }
 
     /**
@@ -230,7 +230,7 @@
      */
     public double fixY( double y )
     {
-		return pageSize.getHeight() - y;
+        return pageSize.getHeight() - y;
     }
 
     /**
@@ -286,11 +286,11 @@
      */
     public void fillPath(int windingRule) throws IOException{
 
-    	graphics.setColor( getGraphicsState().getNonStrokingColorSpace().createColor() );
+        graphics.setColor( getGraphicsState().getNonStrokingColorSpace().createColor() );
 
-    	getLinePath().setWindingRule(windingRule);
+        getLinePath().setWindingRule(windingRule);
 
-    	graphics.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
+        graphics.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
         List subPaths = getLineSubPaths();
         for( int i=0; i<subPaths.size(); i++ )
         {
@@ -307,11 +307,11 @@
 
 
     public void setStroke(BasicStroke newStroke){
-    	getGraphics().setStroke( newStroke );
+        getGraphics().setStroke( newStroke );
     }
 
     public void StrokePath() throws IOException{
-    	graphics.setColor( getGraphicsState().getStrokingColorSpace().createColor() ); //per Ben's 11/15 change in StrokePath.java
+        graphics.setColor( getGraphicsState().getStrokingColorSpace().createColor() ); //per Ben's 11/15 change in StrokePath.java
         List subPaths = getLineSubPaths();
         for( int i=0; i<subPaths.size(); i++ )
         {
@@ -355,13 +355,13 @@
         double finalY = 0.0;
 
         if(scaleX > 0)
-    	{
-	    	finalX = x * scaleX;
-    	}
+        {
+            finalX = x * scaleX;
+        }
         if(scaleY > 0)
         {
-        	finalY = y * scaleY;
-    	}
+            finalY = y * scaleY;
+        }
 
         return new java.awt.geom.Point2D.Double(finalX, finalY);
     }
@@ -377,7 +377,7 @@
         //Get the transformation matrix
         Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
         AffineTransform at = ctm.createAffineTransform();
-       	scaleX = at.getScaleX();
+        scaleX = at.getScaleX();
         scaleY = at.getScaleY();
         return ScaledPoint(x, y, scaleX, scaleY);
     }
@@ -391,11 +391,11 @@
      */
     public void SetClippingPath(int windingRule) throws IOException{
 
-    	graphics.setColor( getGraphicsState().getNonStrokingColorSpace().createColor() );
+        graphics.setColor( getGraphicsState().getNonStrokingColorSpace().createColor() );
 
-    	getLinePath().setWindingRule(windingRule);
+        getLinePath().setWindingRule(windingRule);
 
-    	graphics.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
+        graphics.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
         List subPaths = getLineSubPaths();
         for( int i=0; i<subPaths.size(); i++ )
         {

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java Thu Apr 30 12:07:48 2009
@@ -37,9 +37,9 @@
  */
 public abstract class PDColorSpace extends LoggingObject implements COSObjectable
 {
-	
+    
     protected COSArray array;
-	
+    
     /**
      * This will return the name of the color space.
      *
@@ -87,13 +87,13 @@
     public abstract ColorModel createColorModel( int bpc ) throws IOException;
 
     /*
-	Don't just tell me its color type -- tell me its contents!
+    Don't just tell me its color type -- tell me its contents!
     */
-	public String toString()
+    public String toString()
     {
-	    
+        
         String RetVal = getName() + "{ " + (array==null? "" : array.toString() ) + " }";
-	    
-	return RetVal;
+        
+    return RetVal;
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYK.java Thu Apr 30 12:07:48 2009
@@ -93,7 +93,7 @@
     public ColorSpace createColorSpace() throws IOException
     {
         if( cSpace == null )
-        	cSpace = new ColorSpaceCMYK();
+            cSpace = new ColorSpaceCMYK();
         return cSpace;
     }
 
@@ -108,28 +108,28 @@
      */
     public ColorModel createColorModel( int bpc ) throws IOException
     {
-	    
-	if (bpc >=8) {
-		//from Sector9 ... believed but not proven to be right.
-		int[] nbBits = { bpc, bpc, bpc, bpc };
-		ComponentColorModel componentColorModel = 
-			new ComponentColorModel( createColorSpace(), 
-						 nbBits, 
-						 false,                     
-						 false,              
-						 Transparency.OPAQUE,
-						 DataBuffer.TYPE_BYTE );
-	       return componentColorModel;
-	}else{
-		//Daniel Wilson's implementation with some guidance from Jeremias
-		if (bpc ==1){
-			byte[] map = new byte[] {(byte)0x00, (byte)0xff};
-			ColorModel cm = new IndexColorModel(1, 2, map, map, map, 1);
-			
-			return cm;
-		}else{
-			throw new IOException("Unsure how to create a Color Model for " + bpc + " bits per component");
-		}
-	}
+        
+    if (bpc >=8) {
+        //from Sector9 ... believed but not proven to be right.
+        int[] nbBits = { bpc, bpc, bpc, bpc };
+        ComponentColorModel componentColorModel = 
+            new ComponentColorModel( createColorSpace(), 
+                         nbBits, 
+                         false,                     
+                         false,              
+                         Transparency.OPAQUE,
+                         DataBuffer.TYPE_BYTE );
+           return componentColorModel;
+    }else{
+        //Daniel Wilson's implementation with some guidance from Jeremias
+        if (bpc ==1){
+            byte[] map = new byte[] {(byte)0x00, (byte)0xff};
+            ColorModel cm = new IndexColorModel(1, 2, map, map, map, 1);
+            
+            return cm;
+        }else{
+            throw new IOException("Unsure how to create a Color Model for " + bpc + " bits per component");
+        }
+    }
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Thu Apr 30 12:07:48 2009
@@ -328,18 +328,18 @@
     }
     
         /*
-	Need more info on the ICCBased ones ... Array contains very little.
-	*/
-	public String toString()
+    Need more info on the ICCBased ones ... Array contains very little.
+    */
+    public String toString()
     {
-	    
+        
         String RetVal = super.toString() + "\n\t Number of Components: " ;
-	try{
-		RetVal = RetVal + getNumberOfComponents();
-	}catch (IOException IOe){
-		RetVal = RetVal + IOe.toString();
-	}
-	    
-	return RetVal;
+    try{
+        RetVal = RetVal + getNumberOfComponents();
+    }catch (IOException IOe){
+        RetVal = RetVal + IOe.toString();
+    }
+        
+    return RetVal;
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java Thu Apr 30 12:07:48 2009
@@ -82,7 +82,7 @@
     public int getNumberOfComponents() throws IOException
     {
         //return 1;
-	return array.size();
+    return array.size();
     }
 
     /**
@@ -129,7 +129,7 @@
      */
     public ColorModel createColorModel( int bpc ) throws IOException
     {
-	    logger().info("About to create ColorModel for " + getAlternateColorSpace().toString());
+        logger().info("About to create ColorModel for " + getAlternateColorSpace().toString());
         return getAlternateColorSpace().createColorModel(bpc);
     }
 
@@ -211,17 +211,17 @@
     
     
     /*
-	Some of the key values are stored within the COSDictionary, item 3 in the array.
-	I don't necessarily want to expose the entire dictionary publicly (except in toString()),
-	but need access privately in order to expose the color values publicly.
+    Some of the key values are stored within the COSDictionary, item 3 in the array.
+    I don't necessarily want to expose the entire dictionary publicly (except in toString()),
+    but need access privately in order to expose the color values publicly.
     */
     private COSDictionary getDictionary() throws IOException
     {
-	    return (COSDictionary) array.getObject( 3);
+        return (COSDictionary) array.getObject( 3);
     }
     
     public COSArray getColorValues() throws IOException
     {
-	    return (COSArray) getDictionary().getDictionaryObject("C1");
+        return (COSArray) getDictionary().getDictionaryObject("C1");
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java Thu Apr 30 12:07:48 2009
@@ -102,20 +102,20 @@
      */
     public BufferedImage getRGBImage() throws IOException
     {
-	    BufferedImage retval = null;
-	    
+        BufferedImage retval = null;
+        
         InputStream tiff = new TiffWrapper(
                 getPDStream().getPartiallyFilteredStream( FAX_FILTERS ),
                 getCOSStream());
         try {
             retval = ImageIO.read(tiff);
-	}catch (Exception e){
-		logger().severe(e.toString() + "\n at\n" + FullStackTrace(e));
+    }catch (Exception e){
+        logger().severe(e.toString() + "\n at\n" + FullStackTrace(e));
         } finally {
-		if (tiff != null)
-			tiff.close();
-		
-		return retval;
+        if (tiff != null)
+            tiff.close();
+        
+        return retval;
         }
     }
 
@@ -519,7 +519,7 @@
                     {
                         COSDictionary dic = (COSDictionary)parmsArray.getObject( i );
                         if (dic != null && 
-				( dic.getDictionaryObject( "Columns" ) != null ||
+                ( dic.getDictionaryObject( "Columns" ) != null ||
                             dic.getDictionaryObject( "Rows" ) != null))
                         {
                             decodeParms = dic;

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java Thu Apr 30 12:07:48 2009
@@ -117,68 +117,68 @@
             return image;
         }
 
-	try{
-		int width = getWidth();
-		int height = getHeight();
-		int bpc = getBitsPerComponent();
-		int predictor = getPredictor();
-		List filters = getPDStream().getFilters();
-		
-		byte[] array = getPDStream().getByteArray();
-
-		//logger().info("array contains " + array.length + " bytes.\nUsing " + bpc + " bits per component.");
-		
-	//      Get the ColorModel right
-		PDColorSpace colorspace = getColorSpace();
-		if (colorspace == null){
-			logger().severe("getColorSpace() returned NULL.  Predictor = " + getPredictor());
-			return null;
-		}
-		
-		ColorModel cm = colorspace.createColorModel( bpc );
-		logger().info("ColorModel: " + cm.toString());
-		WritableRaster raster = cm.createCompatibleWritableRaster( width, height );
-		//DataBufferByte buffer = (DataBufferByte)raster.getDataBuffer();
-		DataBufferByte buffer = (DataBufferByte)raster.getDataBuffer();
-		byte[] bufferData = buffer.getData();
-	
-		//logger().info("bufferData contains " + bufferData.length + " bytes.");
-
-		/**
-		 * PDF Spec 1.6 3.3.3 LZW and Flate predictor function
-		 *
-		 * Basically if predictor > 10 and LZW or Flate is being used then the
-		 * predictor is not used.
-		 *
-		 * "For LZWDecode and FlateDecode, a Predictor value greater than or equal to 10
-		 * merely indicates that a PNG predictor is in use; the specific predictor function
-		 * used is explicitly encoded in the incoming data. The value of Predictor supplied
-		 * by the decoding filter need not match the value used when the data was encoded
-		 * if they are both greater than or equal to 10."
-		 */
-		if( predictor < 10 ||
-		    filters == null || !(filters.contains( COSName.LZW_DECODE.getName()) ||
-					 filters.contains( COSName.FLATE_DECODE.getName()) ) )
-		{
-		    PredictorAlgorithm filter = PredictorAlgorithm.getFilter(predictor);
-		    filter.setWidth(width);
-		    filter.setHeight(height);
-		    filter.setBpp((bpc * 3) / 8);
-		    filter.decode(array, bufferData);
-		}
-		else
-		{
-		    System.arraycopy( array, 0,bufferData, 0, (array.length<bufferData.length?array.length: bufferData.length) );
-		}
-		image = new BufferedImage(cm, raster, false, null);
-		
-		return image;
-	} catch (Exception IOe){
-		logger().severe(IOe.toString() + "\n at\n" + FullStackTrace(IOe));
-		//A NULL return is caught in pagedrawer.Invoke.process() so don't re-throw.
-		//Returning the NULL falls through to Phlip Koch's TODO section.
-		return null;
-	}
+    try{
+        int width = getWidth();
+        int height = getHeight();
+        int bpc = getBitsPerComponent();
+        int predictor = getPredictor();
+        List filters = getPDStream().getFilters();
+        
+        byte[] array = getPDStream().getByteArray();
+
+        //logger().info("array contains " + array.length + " bytes.\nUsing " + bpc + " bits per component.");
+        
+    //      Get the ColorModel right
+        PDColorSpace colorspace = getColorSpace();
+        if (colorspace == null){
+            logger().severe("getColorSpace() returned NULL.  Predictor = " + getPredictor());
+            return null;
+        }
+        
+        ColorModel cm = colorspace.createColorModel( bpc );
+        logger().info("ColorModel: " + cm.toString());
+        WritableRaster raster = cm.createCompatibleWritableRaster( width, height );
+        //DataBufferByte buffer = (DataBufferByte)raster.getDataBuffer();
+        DataBufferByte buffer = (DataBufferByte)raster.getDataBuffer();
+        byte[] bufferData = buffer.getData();
+    
+        //logger().info("bufferData contains " + bufferData.length + " bytes.");
+
+        /**
+         * PDF Spec 1.6 3.3.3 LZW and Flate predictor function
+         *
+         * Basically if predictor > 10 and LZW or Flate is being used then the
+         * predictor is not used.
+         *
+         * "For LZWDecode and FlateDecode, a Predictor value greater than or equal to 10
+         * merely indicates that a PNG predictor is in use; the specific predictor function
+         * used is explicitly encoded in the incoming data. The value of Predictor supplied
+         * by the decoding filter need not match the value used when the data was encoded
+         * if they are both greater than or equal to 10."
+         */
+        if( predictor < 10 ||
+            filters == null || !(filters.contains( COSName.LZW_DECODE.getName()) ||
+                     filters.contains( COSName.FLATE_DECODE.getName()) ) )
+        {
+            PredictorAlgorithm filter = PredictorAlgorithm.getFilter(predictor);
+            filter.setWidth(width);
+            filter.setHeight(height);
+            filter.setBpp((bpc * 3) / 8);
+            filter.decode(array, bufferData);
+        }
+        else
+        {
+            System.arraycopy( array, 0,bufferData, 0, (array.length<bufferData.length?array.length: bufferData.length) );
+        }
+        image = new BufferedImage(cm, raster, false, null);
+        
+        return image;
+    } catch (Exception IOe){
+        logger().severe(IOe.toString() + "\n at\n" + FullStackTrace(IOe));
+        //A NULL return is caught in pagedrawer.Invoke.process() so don't re-throw.
+        //Returning the NULL falls through to Phlip Koch's TODO section.
+        return null;
+    }
     }
 
     /**

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java Thu Apr 30 12:07:48 2009
@@ -144,18 +144,18 @@
                     //text extraction then we don't want to throw an exception, so for now
                     //just return a PDPixelMap, which will break later on if it is
                     //actually used, but for text extraction it is not used.
-			
+            
                     return new PDPixelMap( image );
 
                 }
                 /*else if( filters != null && filters.contains(COSName.FLATE_DECODE.getName()))
                 {
-			retval = new PDPixelMap(image);
-		}*/
+            retval = new PDPixelMap(image);
+        }*/
                 else
                 {
                     retval = new PDPixelMap(image);
-			//throw new IOException ("Default branch: filters = " + filters.toString());
+            //throw new IOException ("Default branch: filters = " + filters.toString());
                 }
             }
             else if( subtype.equals( PDXObjectForm.SUB_TYPE ) )

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java Thu Apr 30 12:07:48 2009
@@ -49,8 +49,8 @@
      * This contains the suffix used when writing to file.
      */
     private String suffix;
-	
-	protected PDGraphicsState graphicsState;
+    
+    protected PDGraphicsState graphicsState;
 
     /**
      * Standard constuctor.
@@ -218,7 +218,7 @@
         if( cs != null )
         {
             retval = PDColorSpaceFactory.createColorSpace( cs );
-		if (retval == null) logger().info("About to return NULL from createColorSpace branch");
+        if (retval == null) logger().info("About to return NULL from createColorSpace branch");
         }
         else
         {
@@ -229,15 +229,15 @@
                 COSName.CCITTFAX_DECODE_ABBREVIATION.equals( filter ) )
             {
                 retval = new PDDeviceGray();
-		    if (retval == null) logger().info("About to return NULL from CCITT branch");
-	    }else if (getImageMask()){
-		//Stencil Mask branch.  Section 4.8.5 of the reference, page 350 in version 1.7.
-		    retval = graphicsState.getNonStrokingColorSpace().getColorSpace();
-		    logger().info("Stencil Mask branch returning " + retval.toString());
-		    //throw new IOException("Trace the Stencil Mask!!!!");
-		    
-	    }else
-		logger().info("About to return NULL from unhandled branch. filter = " + filter.toString());
+            if (retval == null) logger().info("About to return NULL from CCITT branch");
+        }else if (getImageMask()){
+        //Stencil Mask branch.  Section 4.8.5 of the reference, page 350 in version 1.7.
+            retval = graphicsState.getNonStrokingColorSpace().getColorSpace();
+            logger().info("Stencil Mask branch returning " + retval.toString());
+            //throw new IOException("Trace the Stencil Mask!!!!");
+            
+        }else
+        logger().info("About to return NULL from unhandled branch. filter = " + filter.toString());
         }
         return retval;
     }
@@ -283,6 +283,6 @@
     */
     public void setGraphicsState(PDGraphicsState newGS)
     {
-	    graphicsState = newGS;
+        graphicsState = newGS;
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java Thu Apr 30 12:07:48 2009
@@ -50,7 +50,7 @@
  */
 public class PDFStreamEngine extends LoggingObject
 {
-	
+    
     private static final byte[] SPACE_BYTES = { (byte)32 };
 
     private PDGraphicsState graphicsState = null;
@@ -92,7 +92,7 @@
         //default constructor
         validCharCnt = 0;
         totalCharCnt = 0;
-	    
+        
     }
 
     /**
@@ -259,12 +259,12 @@
      */
     public void processEncodedText( byte[] string ) throws IOException
     {
-    	/* Note on variable names.  There are three different units being used
-    	 * in this code.  Character sizes are given in glyph units, text locations
-    	 * are initially given in text units, and we want to save the data in 
-    	 * display units. The variable names should end with Text or Disp to 
-    	 * represent if the values are in text or disp units (no glyph units are saved).
-    	 */
+        /* Note on variable names.  There are three different units being used
+         * in this code.  Character sizes are given in glyph units, text locations
+         * are initially given in text units, and we want to save the data in 
+         * display units. The variable names should end with Text or Disp to 
+         * represent if the values are in text or disp units (no glyph units are saved).
+         */
         final float fontSizeText = graphicsState.getTextState().getFontSize();
         final float horizontalScalingText = graphicsState.getTextState().getHorizontalScalingPercent()/100f;
         //float verticalScalingText = horizontalScaling;//not sure if this is right but what else to do???
@@ -284,7 +284,7 @@
         final float glyphSpaceToTextSpaceFactor = 1f/font.getFontMatrix().getValue( 0, 0 );
         
 
-      	// lets see what the space displacement should be
+        // lets see what the space displacement should be
         float spaceWidthText = (font.getFontWidth( SPACE_BYTES, 0, 1 )/glyphSpaceToTextSpaceFactor);
         if( spaceWidthText == 0 )
         {
@@ -323,7 +323,7 @@
         int codeLength = 1;
         for( int i=0; i<string.length; i+=codeLength )
         {
-        	// Decode the value to a Unicode character
+            // Decode the value to a Unicode character
             codeLength = 1;
             String c = font.encode( string, i, codeLength );
             if( c == null && i+1<string.length)
@@ -398,9 +398,9 @@
             //glyphname that has no mapping like "visiblespace"
             if( c != null )
             {
-            	// assume each character is the same size
+                // assume each character is the same size
                 float widthOfEachCharacterForCode = widthText/c.length();
-            	
+                
                 for( int j=0; j<c.length(); j++)
                 {
                     if( stringResult.length()+j <individualWidthsText.length )
@@ -415,9 +415,9 @@
                 validCharCnt += c.length();
             }
             else {
-            	// PDFBOX-373: Replace a null entry with "?" so it is
-            	// not printed as "(null)"
-            	c = "?";
+                // PDFBOX-373: Replace a null entry with "?" so it is
+                // not printed as "(null)"
+                c = "?";
             }
             totalCharCnt += c.length();
             
@@ -445,17 +445,17 @@
         // process the decoded text
         processTextPosition(
                 new TextPosition(
-                		page,
-                		textMatrixStDisp,
-                		textMatrixEndDisp,
-                		totalVerticalDisplacementDisp,
-                		individualWidthsText,
-                		spaceWidthDisp,
-                		stringResult.toString(),
-                		font,
-                		fontSizeText,
-                		(int)(fontSizeText * textMatrix.getXScale()),
-                		wordSpacingDisp ));
+                        page,
+                        textMatrixStDisp,
+                        textMatrixEndDisp,
+                        totalVerticalDisplacementDisp,
+                        individualWidthsText,
+                        spaceWidthDisp,
+                        stringResult.toString(),
+                        font,
+                        fontSizeText,
+                        (int)(fontSizeText * textMatrix.getXScale()),
+                        wordSpacingDisp ));
     }
 
     /**
@@ -493,11 +493,11 @@
             OperatorProcessor processor = (OperatorProcessor)operators.get( operation );
             if( processor != null )
             {
-		processor.setContext(this);
+        processor.setContext(this);
                 processor.process( operator, arguments );
             }else{
-		    logger().warning("NULL processor for operation: " + operation);
-	    }
+            logger().warning("NULL processor for operation: " + operation);
+        }
         }
         catch (Exception e)
         {

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java Thu Apr 30 12:07:48 2009
@@ -38,34 +38,34 @@
      */
     public void process(PDFOperator operator, List arguments) throws IOException
     {
-    	PDColorSpace colorSpace = context.getGraphicsState().getNonStrokingColorSpace().getColorSpace();
-    	if (colorSpace != null) 
-    	{
-		//logger().info("Setting NonStroking colorspace to " + colorSpace);
-		
-    		OperatorProcessor newOperator = null;
-	    	if (colorSpace instanceof PDDeviceGray) 
-	    	    newOperator = new SetNonStrokingGrayColor();
-	    	else if (colorSpace instanceof PDDeviceRGB)
-	    	    newOperator = new SetNonStrokingRGBColor();
-	    	else if (colorSpace instanceof PDDeviceCMYK)
-	   	    	newOperator = new SetNonStrokingCMYKColor();
-	    	else if (colorSpace instanceof PDICCBased)
-		    	newOperator = new SetNonStrokingICCBasedColor();
-		else if (colorSpace instanceof PDCalRGB)
-		    	newOperator = new SetNonStrokingCalRGBColor();
-		else if (colorSpace instanceof PDSeparation)
-			newOperator = new SetNonStrokingSeparation();
+        PDColorSpace colorSpace = context.getGraphicsState().getNonStrokingColorSpace().getColorSpace();
+        if (colorSpace != null) 
+        {
+        //logger().info("Setting NonStroking colorspace to " + colorSpace);
+        
+            OperatorProcessor newOperator = null;
+            if (colorSpace instanceof PDDeviceGray) 
+                newOperator = new SetNonStrokingGrayColor();
+            else if (colorSpace instanceof PDDeviceRGB)
+                newOperator = new SetNonStrokingRGBColor();
+            else if (colorSpace instanceof PDDeviceCMYK)
+                newOperator = new SetNonStrokingCMYKColor();
+            else if (colorSpace instanceof PDICCBased)
+                newOperator = new SetNonStrokingICCBasedColor();
+        else if (colorSpace instanceof PDCalRGB)
+                newOperator = new SetNonStrokingCalRGBColor();
+        else if (colorSpace instanceof PDSeparation)
+            newOperator = new SetNonStrokingSeparation();
 
-	    	if (newOperator != null) 
-	    	{
-	    		newOperator.setContext(getContext());
-	    		newOperator.process(operator, arguments);
-	    	}
-	    	else
-	    		logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
-	}
-	else
-		logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+            if (newOperator != null) 
+            {
+                newOperator.setContext(getContext());
+                newOperator.process(operator, arguments);
+            }
+            else
+                logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
+    }
+    else
+        logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java Thu Apr 30 12:07:48 2009
@@ -42,42 +42,42 @@
     {
         PDColorSpaceInstance colorInstance = context.getGraphicsState().getNonStrokingColorSpace();
         PDColorSpace colorSpace = colorInstance.getColorSpace() ;//.getAlternateColorSpace();
-	List argList = arguments;
-	    
-	    //logger().info("handling color space " + colorSpace.toString());
-	if (colorSpace instanceof PDSeparation){
-		PDSeparation sep = (PDSeparation) colorSpace;
-		colorSpace = sep.getAlternateColorSpace();
-		argList = sep.getColorValues().toList();
-		//logger().info("now handling alternate color space " + colorSpace.toString());
-	}
-	
-	if (colorSpace != null) 
-	{
-		OperatorProcessor newOperator = null;
-		if (colorSpace instanceof PDDeviceGray) 
-		    newOperator = new SetNonStrokingGrayColor();
-		else if (colorSpace instanceof PDDeviceRGB)
-		    newOperator = new SetNonStrokingRGBColor();
-		else if (colorSpace instanceof PDDeviceCMYK)
-			newOperator = new SetNonStrokingCMYKColor();
-		else if (colorSpace instanceof PDICCBased)
-			newOperator = new SetNonStrokingICCBasedColor();
-		else if (colorSpace instanceof PDCalRGB)
-			newOperator = new SetNonStrokingCalRGBColor();
-		else if (colorSpace instanceof PDSeparation)
-			newOperator = new SetNonStrokingSeparation();
+    List argList = arguments;
+        
+        //logger().info("handling color space " + colorSpace.toString());
+    if (colorSpace instanceof PDSeparation){
+        PDSeparation sep = (PDSeparation) colorSpace;
+        colorSpace = sep.getAlternateColorSpace();
+        argList = sep.getColorValues().toList();
+        //logger().info("now handling alternate color space " + colorSpace.toString());
+    }
+    
+    if (colorSpace != null) 
+    {
+        OperatorProcessor newOperator = null;
+        if (colorSpace instanceof PDDeviceGray) 
+            newOperator = new SetNonStrokingGrayColor();
+        else if (colorSpace instanceof PDDeviceRGB)
+            newOperator = new SetNonStrokingRGBColor();
+        else if (colorSpace instanceof PDDeviceCMYK)
+            newOperator = new SetNonStrokingCMYKColor();
+        else if (colorSpace instanceof PDICCBased)
+            newOperator = new SetNonStrokingICCBasedColor();
+        else if (colorSpace instanceof PDCalRGB)
+            newOperator = new SetNonStrokingCalRGBColor();
+        else if (colorSpace instanceof PDSeparation)
+            newOperator = new SetNonStrokingSeparation();
 
-		if (newOperator != null) 
-		{
-			newOperator.setContext(getContext());
-			newOperator.process(operator, argList);
-		}
-		else
-			logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
-	}
-		
-	//} else throw new IOException ("Invalid attempt to process colorspace " + colorSpace.toString() + " in SetNonStrokingSeparation");
+        if (newOperator != null) 
+        {
+            newOperator.setContext(getContext());
+            newOperator.process(operator, argList);
+        }
+        else
+            logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
+    }
+        
+    //} else throw new IOException ("Invalid attempt to process colorspace " + colorSpace.toString() + " in SetNonStrokingSeparation");
         
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java Thu Apr 30 12:07:48 2009
@@ -46,9 +46,9 @@
     public void process(PDFOperator operator, List arguments) throws IOException
     {
 
-    	try {
-	    	PageDrawer drawer = (PageDrawer)context;
-	    	drawer.SetClippingPath(GeneralPath.WIND_EVEN_ODD);
+        try {
+            PageDrawer drawer = (PageDrawer)context;
+            drawer.SetClippingPath(GeneralPath.WIND_EVEN_ODD);
             } catch (Exception e) {
                 logger().warning(e.getMessage() + "\n at\n" + FullStackTrace(e));
             }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java Thu Apr 30 12:07:48 2009
@@ -46,11 +46,11 @@
     public void process(PDFOperator operator, List arguments) throws IOException
     {
 
-	try {
-	    	PageDrawer drawer = (PageDrawer)context;
-	    	drawer.SetClippingPath(GeneralPath.WIND_NON_ZERO);
-	} catch (Exception e) {
-		logger().warning(e.getMessage() + "\n at\n" + FullStackTrace(e));
+    try {
+            PageDrawer drawer = (PageDrawer)context;
+            drawer.SetClippingPath(GeneralPath.WIND_NON_ZERO);
+    } catch (Exception e) {
+        logger().warning(e.getMessage() + "\n at\n" + FullStackTrace(e));
             }
     }
 }

Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java?rev=770181&r1=770180&r2=770181&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java Thu Apr 30 12:07:48 2009
@@ -64,18 +64,18 @@
             PDXObjectImage image = (PDXObjectImage)xobject;
             try
             {
-		image.setGraphicsState(drawer.getGraphicsState());
+        image.setGraphicsState(drawer.getGraphicsState());
                 BufferedImage awtImage = image.getRGBImage();
                 if (awtImage == null) {
-			logger().warning("getRGBImage returned NULL");
+            logger().warning("getRGBImage returned NULL");
                     return;//TODO PKOCH
                 }
                 int imageWidth = awtImage.getWidth();
                 int imageHeight = awtImage.getHeight();
                 double pageHeight = pageSize.getHeight();
 
-		logger().info("imageWidth: " + imageWidth + "\t\timageHeight: " + imageHeight);
-		
+        logger().info("imageWidth: " + imageWidth + "\t\timageHeight: " + imageHeight);
+        
                 Matrix ctm = drawer.getGraphicsState().getCurrentTransformationMatrix();
                 int pageRotation = page.findRotation();
 
@@ -84,27 +84,27 @@
                 Matrix rotationMatrix = new Matrix();
                 rotationMatrix.setFromAffineTransform( ctmAT );
                 if (pageRotation == 0 || pageRotation == 180) {
-	                rotationMatrix.setValue(2,1,(float)pageHeight-ctm.getYPosition()-ctm.getYScale());
+                    rotationMatrix.setValue(2,1,(float)pageHeight-ctm.getYPosition()-ctm.getYScale());
                 }
                 else if (pageRotation == 90 || pageRotation == 270) 
                 {
-	                rotationMatrix.setValue(2,0,(float)ctm.getXPosition()-ctm.getYScale());
-	                rotationMatrix.setValue(2,1,(float)pageHeight-ctm.getYPosition());
+                    rotationMatrix.setValue(2,0,(float)ctm.getXPosition()-ctm.getYScale());
+                    rotationMatrix.setValue(2,1,(float)pageHeight-ctm.getYPosition());
                 }
                 rotationMatrix.setValue(0, 1, (-1)*rotationMatrix.getValue(0, 1));
                 rotationMatrix.setValue(1, 0, (-1)*rotationMatrix.getValue(1, 0));
 
                 AffineTransform at = new AffineTransform(
-                		rotationMatrix.getValue(0,0),rotationMatrix.getValue(0,1),
-                		rotationMatrix.getValue(1,0), rotationMatrix.getValue( 1, 1),
-                		rotationMatrix.getValue(2,0),rotationMatrix.getValue(2,1)
+                        rotationMatrix.getValue(0,0),rotationMatrix.getValue(0,1),
+                        rotationMatrix.getValue(1,0), rotationMatrix.getValue( 1, 1),
+                        rotationMatrix.getValue(2,0),rotationMatrix.getValue(2,1)
                     );
                 graphics.drawImage( awtImage, at, null );
             }
             catch( Exception e )
             {
                 e.printStackTrace();
-		logger().severe(e.toString() + "\n at\n" + FullStackTrace(e));
+        logger().severe(e.toString() + "\n at\n" + FullStackTrace(e));
             }
         }
         else if(xobject instanceof PDXObjectForm)