svn commit: r999470 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter: FilterManager.java JPXFilter.java

[le...@apache.org]

Author: lehmi
Date: Tue Sep 21 15:40:52 2010
New Revision: 999470

URL: http://svn.apache.org/viewvc?rev=999470&view=rev
Log:
PDFBOX-554: added handling for JPEG2000 images via JPXDecode filter as suggested by Timo Boehme and Kenneth Berland

Added:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java   (with props)
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FilterManager.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FilterManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FilterManager.java?rev=999470&r1=999469&r2=999470&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FilterManager.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FilterManager.java Tue Sep 21 15:40:52 2010
@@ -47,6 +47,7 @@ public class FilterManager
         Filter ascii85Filter = new ASCII85Filter();
         Filter runLengthFilter = new RunLengthDecodeFilter();
         Filter cryptFilter = new CryptFilter();
+        Filter jpxFilter = new JPXFilter();
 
         addFilter( COSName.FLATE_DECODE, flateFilter );
         addFilter( COSName.FLATE_DECODE_ABBREVIATION, flateFilter );
@@ -63,6 +64,8 @@ public class FilterManager
         addFilter( COSName.RUN_LENGTH_DECODE, runLengthFilter );
         addFilter( COSName.RUN_LENGTH_DECODE_ABBREVIATION, runLengthFilter );
         addFilter( COSName.CRYPT, cryptFilter );
+        addFilter( COSName.JPX_DECODE, jpxFilter );
+        
     }
 
     /**

Added: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java?rev=999470&view=auto
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java (added)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java Tue Sep 21 15:40:52 2010
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+package org.apache.pdfbox.filter;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSDictionary;
+
+/**
+ * This is used for the JPXDecode filter.
+ *
+ * @author <a href="mailto:timo.boehme@ontochem.com">Timo Böhme</a>
+ * 
+ */
+public class JPXFilter implements Filter
+{
+
+	/** Log instance */
+    private static final Log log = LogFactory.getLog(JPXFilter.class);
+  
+    /**
+     * Decode JPEG2000 data using Java ImageIO library.
+     * 
+     * {@inheritDoc}
+     * 
+     */
+    public void decode( InputStream compressedData, OutputStream result, COSDictionary options, int filterIndex ) 
+        throws IOException
+    {
+        BufferedImage bi = ImageIO.read( compressedData );
+        if ( bi != null )
+        {
+            DataBuffer dBuf = bi.getData().getDataBuffer();
+            if ( dBuf.getDataType() == DataBuffer.TYPE_BYTE )
+            {
+                result.write( ( ( DataBufferByte ) dBuf ).getData() );
+	        }
+            else
+            {
+      			log.error( "Image data buffer not of type byte but type " + dBuf.getDataType() );
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void encode( InputStream rawData, OutputStream result, COSDictionary options, int filterIndex ) 
+        throws IOException
+    {
+        System.err.println( "Warning: JPXFilter.encode is not implemented yet, skipping this stream." );
+    }
+}

Propchange: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native