You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/03/15 22:20:00 UTC
svn commit: r1666846 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter: ./ ccitt/
Author: tilman
Date: Sun Mar 15 21:20:00 2015
New Revision: 1666846
URL: http://svn.apache.org/r1666846
Log:
PDFBOX-2576: misc code cleanup, as suggested by Martin Schröder
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CryptFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/MissingImageReaderException.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Predictor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java Sun Mar 15 21:20:00 2015
@@ -99,12 +99,12 @@ final class ASCIIHexFilter extends Filte
// 12 0x0C Form feed (FF)
// 13 0x0D Carriage return (CR)
// 32 0x20 Space (SP)
- private boolean isWhitespace(int c)
+ private static boolean isWhitespace(int c)
{
return c == 0 || c == 9 || c == 10 || c == 12 || c == 13 || c == 32;
}
- private boolean isEOD(int c)
+ private static boolean isEOD(int c)
{
return c == '>';
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java Sun Mar 15 21:20:00 2015
@@ -115,7 +115,7 @@ final class CCITTFaxFilter extends Filte
return new DecodeResult(parameters);
}
- private void invertBitmap(byte[] bufferData)
+ private static void invertBitmap(byte[] bufferData)
{
for (int i = 0, c = bufferData.length; i < c; i++)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CryptFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CryptFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CryptFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CryptFilter.java Sun Mar 15 21:20:00 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.filter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -40,10 +41,7 @@ final class CryptFilter extends Filter
identityFilter.decode(encoded, decoded, parameters, index);
return new DecodeResult(parameters);
}
- else
- {
- throw new IOException("Unsupported crypt filter " + encryptionName.getName());
- }
+ throw new IOException("Unsupported crypt filter " + encryptionName.getName());
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java Sun Mar 15 21:20:00 2015
@@ -24,12 +24,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
+
import javax.imageio.IIOException;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageInputStream;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSDictionary;
@@ -158,6 +160,8 @@ final class DCTFilter extends Filter
case 2:
raster = fromYCCKtoCMYK(raster);
break;
+ default:
+ throw new IllegalArgumentException("Unknown colorTransform");
}
}
else if (raster.getNumBands() == 3)
@@ -181,7 +185,7 @@ final class DCTFilter extends Filter
}
// reads the APP14 Adobe transform tag and returns its value, or 0 if unknown
- private Integer getAdobeTransform(IIOMetadata metadata)
+ private static Integer getAdobeTransform(IIOMetadata metadata)
{
Element tree = (Element)metadata.getAsTree("javax_imageio_jpeg_image_1.0");
Element markerSequence = (Element)tree.getElementsByTagName("markerSequence").item(0);
@@ -197,7 +201,7 @@ final class DCTFilter extends Filter
// converts YCCK image to CMYK. YCCK is an equivalent encoding for
// CMYK data, so no color management code is needed here, nor does the
// PDF color space have to be consulted
- private WritableRaster fromYCCKtoCMYK(Raster raster) throws IOException
+ private static WritableRaster fromYCCKtoCMYK(Raster raster)
{
WritableRaster writableRaster = raster.createCompatibleWritableRaster();
@@ -236,7 +240,7 @@ final class DCTFilter extends Filter
}
// converts from BGR to RGB
- private WritableRaster fromBGRtoRGB(Raster raster) throws IOException
+ private static WritableRaster fromBGRtoRGB(Raster raster)
{
WritableRaster writableRaster = raster.createCompatibleWritableRaster();
@@ -260,7 +264,7 @@ final class DCTFilter extends Filter
}
// returns the number of channels as a string, or an empty string if there is an error getting the meta data
- private String getNumChannels(ImageReader reader) throws IOException
+ private static String getNumChannels(ImageReader reader)
{
try
{
@@ -284,7 +288,7 @@ final class DCTFilter extends Filter
}
// clamps value to 0-255 range
- private int clamp(float value)
+ private static int clamp(float value)
{
return (int)((value < 0) ? 0 : ((value > 255) ? 255 : value));
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java Sun Mar 15 21:20:00 2015
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Iterator;
+
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
@@ -76,7 +77,7 @@ public abstract class Filter
// gets the decode params for a specific filter index, this is used to
// normalise the DecodeParams entry so that it is always a dictionary
- protected COSDictionary getDecodeParams(COSDictionary dictionary, int index)
+ protected static COSDictionary getDecodeParams(COSDictionary dictionary, int index)
{
COSBase obj = dictionary.getDictionaryObject(COSName.DECODE_PARMS, COSName.DP);
if (obj instanceof COSDictionary)
@@ -107,7 +108,7 @@ public abstract class Filter
* @return The image reader for the format.
* @throws MissingImageReaderException if no image reader is found.
*/
- protected ImageReader findImageReader(String formatName, String errorCause) throws MissingImageReaderException
+ protected static ImageReader findImageReader(String formatName, String errorCause) throws MissingImageReaderException
{
Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(formatName);
ImageReader reader = null;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java Sun Mar 15 21:20:00 2015
@@ -47,7 +47,7 @@ final class FlateFilter extends Filter
{
int predictor = -1;
- COSDictionary decodeParams = getDecodeParams(parameters, index);
+ final COSDictionary decodeParams = getDecodeParams(parameters, index);
if (decodeParams != null)
{
predictor = decodeParams.getInt(COSName.PREDICTOR);
@@ -57,6 +57,7 @@ final class FlateFilter extends Filter
{
if (predictor > 1)
{
+ @SuppressWarnings("null")
int colors = Math.min(decodeParams.getInt(COSName.COLORS, 1), 32);
int bitsPerPixel = decodeParams.getInt(COSName.BITS_PER_COMPONENT, 8);
int columns = decodeParams.getInt(COSName.COLUMNS, 1);
@@ -86,7 +87,7 @@ final class FlateFilter extends Filter
// Use Inflater instead of InflateInputStream to avoid an EOFException due to a probably
// missing Z_STREAM_END, see PDFBOX-1232 for details
- private void decompress(InputStream in, OutputStream out) throws IOException, DataFormatException
+ private static void decompress(InputStream in, OutputStream out) throws IOException, DataFormatException
{
byte[] buf = new byte[2048];
int read = in.read(buf);
Modified: 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=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java Sun Mar 15 21:20:00 2015
@@ -67,7 +67,7 @@ public final class JPXFilter extends Fil
}
// try to read using JAI Image I/O
- private BufferedImage readJPX(InputStream input, DecodeResult result) throws IOException
+ private static BufferedImage readJPX(InputStream input, DecodeResult result) throws IOException
{
ImageReader reader = findImageReader("JPEG2000", "Java Advanced Imaging (JAI) Image I/O Tools are not installed");
ImageInputStream iis = null;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java Sun Mar 15 21:20:00 2015
@@ -24,8 +24,10 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import javax.imageio.stream.MemoryCacheImageInputStream;
import javax.imageio.stream.MemoryCacheImageOutputStream;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSDictionary;
@@ -80,6 +82,7 @@ public class LZWFilter extends Filter
}
if (predictor > 1)
{
+ @SuppressWarnings("null")
int colors = Math.min(decodeParams.getInt(COSName.COLORS, 1), 32);
int bitsPerPixel = decodeParams.getInt(COSName.BITS_PER_COMPONENT, 8);
int columns = decodeParams.getInt(COSName.COLUMNS, 1);
@@ -98,11 +101,11 @@ public class LZWFilter extends Filter
return new DecodeResult(parameters);
}
- private void doLZWDecode(InputStream encoded, OutputStream decoded, int earlyChange) throws IOException
+ private static void doLZWDecode(InputStream encoded, OutputStream decoded, int earlyChange) throws IOException
{
List<byte[]> codeTable = new ArrayList<byte[]>();
int chunk = 9;
- MemoryCacheImageInputStream in = new MemoryCacheImageInputStream(encoded);
+ final MemoryCacheImageInputStream in = new MemoryCacheImageInputStream(encoded);
long nextCommand;
long prevCommand = -1;
@@ -163,7 +166,7 @@ public class LZWFilter extends Filter
int chunk = 9;
byte[] inputPattern = null;
- MemoryCacheImageOutputStream out = new MemoryCacheImageOutputStream(encoded);
+ final MemoryCacheImageOutputStream out = new MemoryCacheImageOutputStream(encoded);
out.writeBits(CLEAR_TABLE, chunk);
int foundCode = -1;
int r;
@@ -223,7 +226,8 @@ public class LZWFilter extends Filter
out.writeBits(0, 7);
// must do or file will be empty :-(
- out.flush();
+ out.flush();
+ out.close();
}
/**
@@ -234,7 +238,7 @@ public class LZWFilter extends Filter
* @return The index of the longest matching pattern or -1 if nothing is
* found.
*/
- private int findPatternCode(List<byte[]> codeTable, byte[] pattern)
+ private static int findPatternCode(List<byte[]> codeTable, byte[] pattern)
{
int foundCode = -1;
int foundLen = 0;
@@ -268,7 +272,7 @@ public class LZWFilter extends Filter
* Init the code table with 1 byte entries and the EOD and CLEAR_TABLE
* markers.
*/
- private List<byte[]> createCodeTable()
+ private static List<byte[]> createCodeTable()
{
List<byte[]> codeTable = new ArrayList<byte[]>(4096);
for (int i = 0; i < 256; ++i)
@@ -288,7 +292,7 @@ public class LZWFilter extends Filter
*
* @return a value between 9 and 12
*/
- private int calculateChunk(int tabSize, int earlyChange)
+ private static int calculateChunk(int tabSize, int earlyChange)
{
if (tabSize >= 2048 - earlyChange)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/MissingImageReaderException.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/MissingImageReaderException.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/MissingImageReaderException.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/MissingImageReaderException.java Sun Mar 15 21:20:00 2015
@@ -25,6 +25,11 @@ import java.io.IOException;
*/
public class MissingImageReaderException extends IOException
{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public MissingImageReaderException(String message)
{
super(message);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Predictor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Predictor.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Predictor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Predictor.java Sun Mar 15 21:20:00 2015
@@ -18,6 +18,7 @@ package org.apache.pdfbox.filter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import org.apache.pdfbox.io.IOUtils;
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java?rev=1666846&r1=1666845&r2=1666846&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java Sun Mar 15 21:20:00 2015
@@ -38,6 +38,7 @@ public final class FillOrderChangeInputS
}
/** {@inheritDoc} */
+ @Override
public int read(byte[] b, int off, int len) throws IOException
{
int result = super.read(b, off, len);
@@ -53,6 +54,7 @@ public final class FillOrderChangeInputS
}
/** {@inheritDoc} */
+ @Override
public int read() throws IOException
{
int b = super.read();