You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/26 22:08:20 UTC
svn commit: r1545839 [1/5] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/common/bytesource/
main/java/org/apache/commons/imaging/common/my...
Author: ebourg
Date: Tue Nov 26 21:08:17 2013
New Revision: 1545839
URL: http://svn.apache.org/r1545839
Log:
Java-style array declarations + extra style changes
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageDump.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryInputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryOutputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/FastByteArrayOutputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/ZigZag.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App14Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java Tue Nov 26 21:08:17 2013
@@ -89,7 +89,7 @@ public class FormatCompliance {
return value + " (" + Integer.toHexString(value) + ")";
}
- public boolean compare_bytes(final String name, final byte expected[], final byte actual[])
+ public boolean compare_bytes(final String name, final byte[] expected, final byte[] actual)
throws ImageReadException {
if (expected.length != actual.length) {
addComment(name + ": " + "Unexpected length: (expected: "
@@ -127,7 +127,7 @@ public class FormatCompliance {
return compare(name, new int[] { valid, }, actual);
}
- public boolean compare(final String name, final int valid[], final int actual)
+ public boolean compare(final String name, final int[] valid, final int actual)
throws ImageReadException {
for (final int element : valid) {
if (actual == element) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageDump.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageDump.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageDump.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageDump.java Tue Nov 26 21:08:17 2013
@@ -66,7 +66,7 @@ public class ImageDump {
final ICC_ColorSpace fICC_ColorSpace = (ICC_ColorSpace) cs;
final ICC_Profile fICC_Profile = fICC_ColorSpace.getProfile();
- final byte bytes[] = fICC_Profile.getData();
+ final byte[] bytes = fICC_Profile.getData();
final IccProfileParser parser = new IccProfileParser();
@@ -85,7 +85,7 @@ public class ImageDump {
}
public void dumpBIProps(final String prefix, final BufferedImage src) {
- final String keys[] = src.getPropertyNames();
+ final String[] keys = src.getPropertyNames();
if (keys == null) {
System.out.println(prefix + ": no props");
return;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java Tue Nov 26 21:08:17 2013
@@ -178,7 +178,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final byte bytes[])
+ public final IImageMetadata getMetadata(final byte[] bytes)
throws ImageReadException, IOException {
return getMetadata(bytes, null);
}
@@ -205,7 +205,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final byte bytes[], final Map<String,Object> params)
+ public final IImageMetadata getMetadata(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -343,7 +343,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful data
* access operation.
*/
- public final ImageInfo getImageInfo(final byte bytes[], final Map<String,Object> params)
+ public final ImageInfo getImageInfo(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(bytes), params);
}
@@ -406,7 +406,7 @@ public abstract class ImageParser extend
* @throws IOException
* may be thrown by sub-classes
*/
- public final FormatCompliance getFormatCompliance(final byte bytes[])
+ public final FormatCompliance getFormatCompliance(final byte[] bytes)
throws ImageReadException, IOException {
return getFormatCompliance(new ByteSourceArray(bytes));
}
@@ -464,7 +464,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final List<BufferedImage> getAllBufferedImages(final byte bytes[])
+ public final List<BufferedImage> getAllBufferedImages(final byte[] bytes)
throws ImageReadException, IOException {
return getAllBufferedImages(new ByteSourceArray(bytes));
}
@@ -523,7 +523,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final BufferedImage getBufferedImage(final byte bytes[], final Map<String,Object> params)
+ public final BufferedImage getBufferedImage(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceArray(bytes), params);
}
@@ -591,7 +591,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final Dimension getImageSize(final byte bytes[])
+ public final Dimension getImageSize(final byte[] bytes)
throws ImageReadException, IOException {
return getImageSize(bytes, null);
}
@@ -608,7 +608,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final Dimension getImageSize(final byte bytes[], final Map<String,Object> params)
+ public final Dimension getImageSize(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getImageSize(new ByteSourceArray(bytes), params);
}
@@ -701,7 +701,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final byte[] getICCProfileBytes(final byte bytes[])
+ public final byte[] getICCProfileBytes(final byte[] bytes)
throws ImageReadException, IOException {
return getICCProfileBytes(bytes, null);
}
@@ -720,7 +720,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final byte[] getICCProfileBytes(final byte bytes[], final Map<String,Object> params)
+ public final byte[] getICCProfileBytes(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getICCProfileBytes(new ByteSourceArray(bytes), params);
}
@@ -799,7 +799,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final String dumpImageFile(final byte bytes[]) throws ImageReadException,
+ public final String dumpImageFile(final byte[] bytes) throws ImageReadException,
IOException {
return dumpImageFile(new ByteSourceArray(bytes));
}
@@ -879,7 +879,7 @@ public abstract class ImageParser extend
* @param profile An array of bytes describing the ICC profile
* @return true if the embedding operation was successful; otherwise, false.
*/
- public abstract boolean embedICCProfile(File src, File dst, byte profile[]);
+ public abstract boolean embedICCProfile(File src, File dst, byte[] profile);
/**
* Get a descriptive name for the implementation of an ImageParser.
@@ -915,7 +915,7 @@ public abstract class ImageParser extend
* @return If the parser can accept the format, true; otherwise, false.
*/
public boolean canAcceptType(final ImageFormat type) {
- final ImageFormat types[] = getAcceptedTypes();
+ final ImageFormat[] types = getAcceptedTypes();
for (final ImageFormat type2 : types) {
if (type2.equals(type)) {
@@ -942,7 +942,7 @@ public abstract class ImageParser extend
* @return If the parser can accept the format, true; otherwise, false.
*/
protected final boolean canAcceptExtension(final String filename) {
- final String exts[] = getAcceptedExtensions();
+ final String[] exts = getAcceptedExtensions();
if (exts == null) {
return true;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Tue Nov 26 21:08:17 2013
@@ -138,9 +138,9 @@ public abstract class Imaging implements
filename = filename.toLowerCase(Locale.ENGLISH);
- final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
+ final ImageParser[] imageParsers = ImageParser.getAllImageParsers();
for (final ImageParser imageParser : imageParsers) {
- final String exts[] = imageParser.getAcceptedExtensions();
+ final String[] exts = imageParser.getAcceptedExtensions();
for (final String ext : exts) {
if (filename.endsWith(ext.toLowerCase(Locale.ENGLISH))) {
@@ -167,7 +167,7 @@ public abstract class Imaging implements
* ImageFormat.IMAGE_FORMAT_UNKNOWN if the image type cannot be
* determined.
*/
- public static ImageFormat guessFormat(final byte bytes[])
+ public static ImageFormat guessFormat(final byte[] bytes)
throws ImageReadException, IOException {
return guessFormat(new ByteSourceArray(bytes));
}
@@ -192,7 +192,7 @@ public abstract class Imaging implements
return guessFormat(new ByteSourceFile(file));
}
- private static boolean compareBytePair(final int[] a, final int b[]) {
+ private static boolean compareBytePair(final int[] a, final int[] b) {
if (a.length != 2 && b.length != 2) {
throw new RuntimeException("Invalid Byte Pair.");
}
@@ -240,7 +240,7 @@ public abstract class Imaging implements
final int b1 = i1 & 0xff;
final int b2 = i2 & 0xff;
- final int bytePair[] = { b1, b2, };
+ final int[] bytePair = { b1, b2, };
if (compareBytePair(MAGIC_NUMBERS_GIF, bytePair)) {
canThrow = true;
@@ -299,7 +299,7 @@ public abstract class Imaging implements
final int b3 = i3 & 0xff;
final int b4 = i4 & 0xff;
- final int bytePair2[] = { b3, b4, };
+ final int[] bytePair2 = { b3, b4, };
if (compareBytePair(MAGIC_NUMBERS_JBIG2_2, bytePair2)) {
canThrow = true;
return ImageFormats.JBIG2;
@@ -331,7 +331,7 @@ public abstract class Imaging implements
* @return An instance of ICC_Profile or null if the image contains no ICC
* profile.
*/
- public static ICC_Profile getICCProfile(final byte bytes[])
+ public static ICC_Profile getICCProfile(final byte[] bytes)
throws ImageReadException, IOException {
return getICCProfile(bytes, null);
}
@@ -348,7 +348,7 @@ public abstract class Imaging implements
* @return An instance of ICC_Profile or null if the image contains no ICC
* profile..
*/
- public static ICC_Profile getICCProfile(final byte bytes[], final Map<String,Object> params)
+ public static ICC_Profile getICCProfile(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getICCProfile(new ByteSourceArray(bytes), params);
}
@@ -423,7 +423,7 @@ public abstract class Imaging implements
protected static ICC_Profile getICCProfile(final ByteSource byteSource, final Map<String,Object> params)
throws ImageReadException, IOException {
- final byte bytes[] = getICCProfileBytes(byteSource, params);
+ final byte[] bytes = getICCProfileBytes(byteSource, params);
if (bytes == null) {
return null;
}
@@ -454,7 +454,7 @@ public abstract class Imaging implements
* @see IccProfileParser
* @see ICC_Profile
*/
- public static byte[] getICCProfileBytes(final byte bytes[])
+ public static byte[] getICCProfileBytes(final byte[] bytes)
throws ImageReadException, IOException {
return getICCProfileBytes(bytes, null);
}
@@ -475,7 +475,7 @@ public abstract class Imaging implements
* @see IccProfileParser
* @see ICC_Profile
*/
- public static byte[] getICCProfileBytes(final byte bytes[], final Map<String,Object> params)
+ public static byte[] getICCProfileBytes(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getICCProfileBytes(new ByteSourceArray(bytes), params);
}
@@ -545,7 +545,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final String filename, final byte bytes[],
+ public static ImageInfo getImageInfo(final String filename, final byte[] bytes,
final Map<String,Object> params) throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(filename, bytes), params);
}
@@ -566,7 +566,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final String filename, final byte bytes[])
+ public static ImageInfo getImageInfo(final String filename, final byte[] bytes)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(filename, bytes), null);
}
@@ -629,7 +629,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final byte bytes[])
+ public static ImageInfo getImageInfo(final byte[] bytes)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(bytes), null);
}
@@ -650,7 +650,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final byte bytes[], final Map<String,Object> params)
+ public static ImageInfo getImageInfo(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(bytes), params);
}
@@ -707,7 +707,7 @@ public abstract class Imaging implements
final ImageFormat format = guessFormat(byteSource);
if (!format.equals(ImageFormats.UNKNOWN)) {
- final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
+ final ImageParser[] imageParsers = ImageParser.getAllImageParsers();
for (final ImageParser imageParser : imageParsers) {
if (imageParser.canAcceptType(format)) {
@@ -718,7 +718,7 @@ public abstract class Imaging implements
final String filename = byteSource.getFilename();
if (filename != null) {
- final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
+ final ImageParser[] imageParsers = ImageParser.getAllImageParsers();
for (final ImageParser imageParser : imageParsers) {
if (imageParser.canAcceptExtension(filename)) {
@@ -770,7 +770,7 @@ public abstract class Imaging implements
* Byte array containing an image file.
* @return The width and height of the image.
*/
- public static Dimension getImageSize(final byte bytes[])
+ public static Dimension getImageSize(final byte[] bytes)
throws ImageReadException, IOException {
return getImageSize(bytes, null);
}
@@ -785,7 +785,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return The width and height of the image.
*/
- public static Dimension getImageSize(final byte bytes[], final Map<String,Object> params)
+ public static Dimension getImageSize(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getImageSize(new ByteSourceArray(bytes), params);
}
@@ -865,7 +865,7 @@ public abstract class Imaging implements
* Byte array containing an image file.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final byte bytes[]) throws ImageReadException,
+ public static String getXmpXml(final byte[] bytes) throws ImageReadException,
IOException {
return getXmpXml(bytes, null);
}
@@ -880,7 +880,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final byte bytes[], final Map<String,Object> params)
+ public static String getXmpXml(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getXmpXml(new ByteSourceArray(bytes), params);
}
@@ -948,7 +948,7 @@ public abstract class Imaging implements
* @return An instance of IImageMetadata.
* @see IImageMetadata
*/
- public static IImageMetadata getMetadata(final byte bytes[])
+ public static IImageMetadata getMetadata(final byte[] bytes)
throws ImageReadException, IOException {
return getMetadata(bytes, null);
}
@@ -973,7 +973,7 @@ public abstract class Imaging implements
* @return An instance of IImageMetadata.
* @see IImageMetadata
*/
- public static IImageMetadata getMetadata(final byte bytes[], final Map<String,Object> params)
+ public static IImageMetadata getMetadata(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -1096,7 +1096,7 @@ public abstract class Imaging implements
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public static String dumpImageFile(final byte bytes[]) throws ImageReadException,
+ public static String dumpImageFile(final byte[] bytes) throws ImageReadException,
IOException {
return dumpImageFile(new ByteSourceArray(bytes));
}
@@ -1134,7 +1134,7 @@ public abstract class Imaging implements
* @throws ImageReadException in the event of unreadable data.
* @throws IOException in the event of an unrecoverable I/O condition.
*/
- public static FormatCompliance getFormatCompliance(final byte bytes[])
+ public static FormatCompliance getFormatCompliance(final byte[] bytes)
throws ImageReadException, IOException {
return getFormatCompliance(new ByteSourceArray(bytes));
}
@@ -1188,7 +1188,7 @@ public abstract class Imaging implements
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public static List<BufferedImage> getAllBufferedImages(final byte bytes[])
+ public static List<BufferedImage> getAllBufferedImages(final byte[] bytes)
throws ImageReadException, IOException {
return getAllBufferedImages(new ByteSourceArray(bytes));
}
@@ -1285,7 +1285,7 @@ public abstract class Imaging implements
* while reading an image (i.e. a format violation, etc.).
* @throws IOException in the event of an unrecoverable I/O exception.
*/
- public static BufferedImage getBufferedImage(final byte bytes[])
+ public static BufferedImage getBufferedImage(final byte[] bytes)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceArray(bytes), null);
}
@@ -1311,7 +1311,7 @@ public abstract class Imaging implements
* while reading an image (i.e. a format violation, etc.).
* @throws IOException in the event of an unrecoverable I/O exception.
*/
- public static BufferedImage getBufferedImage(final byte bytes[], final Map<String,Object> params)
+ public static BufferedImage getBufferedImage(final byte[] bytes, final Map<String,Object> params)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceArray(bytes), params);
}
@@ -1476,7 +1476,7 @@ public abstract class Imaging implements
public static void writeImage(final BufferedImage src, final OutputStream os,
final ImageFormat format, Map<String,Object> params) throws ImageWriteException,
IOException {
- final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
+ final ImageParser[] imageParsers = ImageParser.getAllImageParsers();
// make sure params are non-null
if (params == null) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFileParser.java Tue Nov 26 21:08:17 2013
@@ -65,7 +65,7 @@ public class BinaryFileParser {
return ByteConversions.toBytes(value, byteOrder);
}
- protected final int toInt(final byte bytes[]) {
+ protected final int toInt(final byte[] bytes) {
return ByteConversions.toInt(bytes, byteOrder);
}
@@ -73,7 +73,7 @@ public class BinaryFileParser {
return ByteConversions.toUInt16(bytes, byteOrder);
}
- protected final int toUInt16(final byte bytes[], final int start) {
+ protected final int toUInt16(final byte[] bytes, final int start) {
return ByteConversions.toUInt16(bytes, start, byteOrder);
}
@@ -121,7 +121,7 @@ public class BinaryFileParser {
BinaryFunctions.readAndVerifyBytes(is, expected, exception);
}
- protected final void readAndVerifyBytes(final InputStream is, final byte expected[],
+ protected final void readAndVerifyBytes(final InputStream is, final byte[] expected,
final String exception) throws ImageReadException, IOException {
BinaryFunctions.readAndVerifyBytes(is, expected, exception);
}
@@ -141,19 +141,19 @@ public class BinaryFileParser {
BinaryFunctions.skipBytes(is, length, exception);
}
- protected final byte[] remainingBytes(final String name, final byte bytes[], final int count) {
+ protected final byte[] remainingBytes(final String name, final byte[] bytes, final int count) {
return BinaryFunctions.remainingBytes(name, bytes, count);
}
- protected final byte[] slice(final byte bytes[], final int start, final int count) {
+ protected final byte[] slice(final byte[] bytes, final int start, final int count) {
return BinaryFunctions.slice(bytes, start, count);
}
- protected final int findNull(final byte src[]) {
+ protected final int findNull(final byte[] src) {
return BinaryFunctions.findNull(src);
}
- protected final int findNull(final byte src[], final int start) {
+ protected final int findNull(final byte[] src, final int start) {
return BinaryFunctions.findNull(src, start);
}
@@ -200,12 +200,12 @@ public class BinaryFileParser {
pw.flush();
}
- protected final boolean compareBytes(final byte a[], final int aStart, final byte b[],
+ protected final boolean compareBytes(final byte[] a, final int aStart, final byte[] b,
final int bStart, final int length) {
return BinaryFunctions.compareBytes(a, aStart, b, bStart, length);
}
- protected static boolean startsWith(final byte haystack[], final BinaryConstant needle) {
+ protected static boolean startsWith(final byte[] haystack, final BinaryConstant needle) {
if ((haystack == null) || (haystack.length < needle.size())) {
return false;
}
@@ -219,7 +219,7 @@ public class BinaryFileParser {
return true;
}
- protected static boolean startsWith(final byte haystack[], final byte needle[]) {
+ protected static boolean startsWith(final byte[] haystack, final byte[] needle) {
return BinaryFunctions.startsWith(haystack, needle);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java Tue Nov 26 21:08:17 2013
@@ -33,7 +33,7 @@ public final class BinaryFunctions {
private BinaryFunctions() {
}
- public static boolean startsWith(final byte haystack[], final byte needle[]) {
+ public static boolean startsWith(final byte[] haystack, final byte[] needle) {
if (needle == null) {
return false;
}
@@ -70,7 +70,7 @@ public final class BinaryFunctions {
public static byte[] readBytes(final String name, final InputStream is, final int length,
final String exception) throws IOException {
- final byte result[] = new byte[length];
+ final byte[] result = new byte[length];
int read = 0;
while (read < length) {
final int count = is.read(result, read, length - read);
@@ -89,7 +89,7 @@ public final class BinaryFunctions {
return readBytes("", is, count, "Unexpected EOF");
}
- public static void readAndVerifyBytes(final InputStream is, final byte expected[],
+ public static void readAndVerifyBytes(final InputStream is, final byte[] expected,
final String exception) throws ImageReadException, IOException {
for (final byte element : expected) {
final int data = is.read();
@@ -123,9 +123,9 @@ public final class BinaryFunctions {
}
public static void readAndVerifyBytes(final String name, final InputStream is,
- final byte expected[], final String exception) throws ImageReadException,
+ final byte[] expected, final String exception) throws ImageReadException,
IOException {
- final byte bytes[] = readBytes(name, is, expected.length, exception);
+ final byte[] bytes = readBytes(name, is, expected.length, exception);
for (int i = 0; i < expected.length; i++) {
if (bytes[i] != expected[i]) {
@@ -161,31 +161,31 @@ public final class BinaryFunctions {
}
}
- public static byte[] remainingBytes(final String name, final byte bytes[], final int count) {
+ public static byte[] remainingBytes(final String name, final byte[] bytes, final int count) {
return slice(bytes, count, bytes.length - count);
}
- public static byte[] slice(final byte bytes[], final int start, final int count) {
- final byte result[] = new byte[count];
+ public static byte[] slice(final byte[] bytes, final int start, final int count) {
+ final byte[] result = new byte[count];
System.arraycopy(bytes, start, result, 0, count);
return result;
}
- public static byte[] tail(final byte bytes[], int count) {
+ public static byte[] tail(final byte[] bytes, int count) {
if (count > bytes.length) {
count = bytes.length;
}
return slice(bytes, bytes.length - count, count);
}
- public static byte[] head(final byte bytes[], int count) {
+ public static byte[] head(final byte[] bytes, int count) {
if (count > bytes.length) {
count = bytes.length;
}
return slice(bytes, 0, count);
}
- public static boolean compareBytes(final byte a[], final int aStart, final byte b[],
+ public static boolean compareBytes(final byte[] a, final int aStart, final byte[] b,
final int bStart, final int length) {
if (a.length < (aStart + length)) {
return false;
@@ -286,11 +286,11 @@ public final class BinaryFunctions {
return (((0xff & c1) << 24) | ((0xff & c2) << 16) | ((0xff & c3) << 8) | ((0xff & c4) << 0));
}
- public static int findNull(final byte src[]) {
+ public static int findNull(final byte[] src) {
return findNull(src, 0);
}
- public static int findNull(final byte src[], final int start) {
+ public static int findNull(final byte[] src, final int start) {
for (int i = start; i < src.length; i++) {
if (src[i] == 0) {
return i;
@@ -301,7 +301,7 @@ public final class BinaryFunctions {
public static byte[] getRAFBytes(final RandomAccessFile raf, final long pos,
final int length, final String exception) throws IOException {
- final byte result[] = new byte[length];
+ final byte[] result = new byte[length];
raf.seek(pos);
@@ -325,7 +325,7 @@ public final class BinaryFunctions {
public static void copyStreamToStream(final InputStream is, final OutputStream os)
throws IOException {
- final byte buffer[] = new byte[1024];
+ final byte[] buffer = new byte[1024];
int read;
while ((read = is.read(buffer)) > 0) {
os.write(buffer, 0, read);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryInputStream.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryInputStream.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryInputStream.java Tue Nov 26 21:08:17 2013
@@ -42,7 +42,7 @@ public class BinaryInputStream extends I
return BinaryFunctions.read4Bytes(name, is, exception, byteOrder);
}
- public final void readAndVerifyBytes(final byte expected[], final String exception)
+ public final void readAndVerifyBytes(final byte[] expected, final String exception)
throws ImageReadException, IOException {
BinaryFunctions.readAndVerifyBytes(is, expected, exception);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryOutputStream.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryOutputStream.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BinaryOutputStream.java Tue Nov 26 21:08:17 2013
@@ -59,13 +59,13 @@ public class BinaryOutputStream extends
}
@Override
- public final void write(final byte bytes[]) throws IOException {
+ public final void write(final byte[] bytes) throws IOException {
os.write(bytes, 0, bytes.length);
count += bytes.length;
}
@Override
- public final void write(final byte bytes[], final int offset, final int length) throws IOException {
+ public final void write(final byte[] bytes, final int offset, final int length) throws IOException {
os.write(bytes, offset, length);
count += length;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/FastByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/FastByteArrayOutputStream.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/FastByteArrayOutputStream.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/FastByteArrayOutputStream.java Tue Nov 26 21:08:17 2013
@@ -24,7 +24,7 @@ import java.io.OutputStream;
* because it's not thread safe.
*/
class FastByteArrayOutputStream extends OutputStream {
- private final byte bytes[];
+ private final byte[] bytes;
private int count = 0;
public FastByteArrayOutputStream(final int length) {
@@ -43,7 +43,7 @@ class FastByteArrayOutputStream extends
public byte[] toByteArray() {
if (count < bytes.length) {
- final byte result[] = new byte[count];
+ final byte[] result = new byte[count];
System.arraycopy(bytes, 0, result, 0, count);
return result;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java Tue Nov 26 21:08:17 2013
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.util.I
public class PackBits {
- public byte[] decompress(final byte bytes[], final int expected)
+ public byte[] decompress(final byte[] bytes, final int expected)
throws ImageReadException {
int total = 0;
@@ -72,7 +72,7 @@ public class PackBits {
}
- private int findNextDuplicate(final byte bytes[], final int start) {
+ private int findNextDuplicate(final byte[] bytes, final int start) {
// int last = -1;
if (start >= bytes.length) {
return -1;
@@ -93,7 +93,7 @@ public class PackBits {
return -1;
}
- private int findRunLength(final byte bytes[], final int start) {
+ private int findRunLength(final byte[] bytes, final int start) {
final byte b = bytes[start];
int i;
@@ -105,7 +105,7 @@ public class PackBits {
return i - start;
}
- public byte[] compress(final byte bytes[]) throws IOException {
+ public byte[] compress(final byte[] bytes) throws IOException {
FastByteArrayOutputStream baos = null;
boolean canThrow = false;
try {
@@ -153,7 +153,7 @@ public class PackBits {
}
}
}
- final byte result[] = baos.toByteArray();
+ final byte[] result = baos.toByteArray();
canThrow = true;
return result;
} finally {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java Tue Nov 26 21:08:17 2013
@@ -21,14 +21,14 @@ import java.io.IOException;
import java.io.InputStream;
public class ByteSourceArray extends ByteSource {
- private final byte bytes[];
+ private final byte[] bytes;
- public ByteSourceArray(final String filename, final byte bytes[]) {
+ public ByteSourceArray(final String filename, final byte[] bytes) {
super(filename);
this.bytes = bytes;
}
- public ByteSourceArray(final byte bytes[]) {
+ public ByteSourceArray(final byte[] bytes) {
super(null);
this.bytes = bytes;
}
@@ -49,7 +49,7 @@ public class ByteSourceArray extends Byt
+ bytes.length + ").");
}
- final byte result[] = new byte[length];
+ final byte[] result = new byte[length];
System.arraycopy(bytes, start, result, 0, length);
return result;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java Tue Nov 26 21:08:17 2013
@@ -79,7 +79,7 @@ public class ByteSourceFile extends Byte
try {
is = new FileInputStream(file);
is = new BufferedInputStream(is);
- final byte buffer[] = new byte[1024];
+ final byte[] buffer = new byte[1024];
int read;
while ((read = is.read(buffer)) > 0) {
baos.write(buffer, 0, read);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java Tue Nov 26 21:08:17 2013
@@ -27,7 +27,7 @@ public class ByteSourceInputStream exten
private final InputStream is;
private CacheBlock cacheHead = null;
private static final int BLOCK_SIZE = 1024;
- private byte readBuffer[] = null;
+ private byte[] readBuffer = null;
private long streamLength = -1;
public ByteSourceInputStream(final InputStream is, final String filename) {
@@ -36,7 +36,7 @@ public class ByteSourceInputStream exten
}
private class CacheBlock {
- public final byte bytes[];
+ public final byte[] bytes;
private CacheBlock next = null;
private boolean triedNext = false;
@@ -68,12 +68,12 @@ public class ByteSourceInputStream exten
return null;
} else if (read < BLOCK_SIZE) {
// return a copy.
- final byte result[] = new byte[read];
+ final byte[] result = new byte[read];
System.arraycopy(readBuffer, 0, result, 0, read);
return new CacheBlock(result);
} else {
// return current buffer.
- final byte result[] = readBuffer;
+ final byte[] result = readBuffer;
readBuffer = null;
return new CacheBlock(result);
}
@@ -118,7 +118,7 @@ public class ByteSourceInputStream exten
}
@Override
- public int read(final byte b[], final int off, final int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
// first section copied verbatim from InputStream
if (b == null) {
throw new NullPointerException();
@@ -221,7 +221,7 @@ public class ByteSourceInputStream exten
final InputStream cis = getInputStream();
BinaryFunctions.skipBytes(cis, blockStart);
- final byte bytes[] = new byte[blockLength];
+ final byte[] bytes = new byte[blockLength];
int total = 0;
while (true) {
final int read = cis.read(bytes, total, bytes.length - total);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java Tue Nov 26 21:08:17 2013
@@ -45,7 +45,7 @@ public class BitsToByteInputStream exten
}
public int[] readBitsArray(final int sampleBits, final int length) throws IOException {
- final int result[] = new int[length];
+ final int[] result = new int[length];
for (int i = 0; i < length; i++) {
result[i] = readBits(sampleBits);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java Tue Nov 26 21:08:17 2013
@@ -88,12 +88,12 @@ public class MyLzwCompressor {
}
private final static class ByteArray {
- private final byte bytes[];
+ private final byte[] bytes;
private final int start;
private final int length;
private final int hash;
- public ByteArray(final byte bytes[], final int start, final int length) {
+ public ByteArray(final byte[] bytes, final int start, final int length) {
this.bytes = bytes;
this.start = start;
this.length = length;
@@ -136,7 +136,7 @@ public class MyLzwCompressor {
}
}
- private ByteArray arrayToKey(final byte bytes[], final int start, final int length) {
+ private ByteArray arrayToKey(final byte[] bytes, final int start, final int length) {
return new ByteArray(bytes, start, length);
}
@@ -167,13 +167,13 @@ public class MyLzwCompressor {
bos.writeBits(code, codeSize);
}
- private boolean isInTable(final byte bytes[], final int start, final int length) {
+ private boolean isInTable(final byte[] bytes, final int start, final int length) {
final ByteArray key = arrayToKey(bytes, start, length);
return map.containsKey(key);
}
- private int codeFromString(final byte bytes[], final int start, final int length)
+ private int codeFromString(final byte[] bytes, final int start, final int length)
throws IOException {
final ByteArray key = arrayToKey(bytes, start, length);
final Integer code = map.get(key);
@@ -183,7 +183,7 @@ public class MyLzwCompressor {
return code;
}
- private boolean addTableEntry(final MyBitOutputStream bos, final byte bytes[],
+ private boolean addTableEntry(final MyBitOutputStream bos, final byte[] bytes,
final int start, final int length) throws IOException {
final ByteArray key = arrayToKey(bytes, start, length);
return addTableEntry(bos, key);
@@ -226,7 +226,7 @@ public class MyLzwCompressor {
void init(int clearCode, int eoiCode);
}
- public byte[] compress(final byte bytes[]) throws IOException {
+ public byte[] compress(final byte[] bytes) throws IOException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length);
final MyBitOutputStream bos = new MyBitOutputStream(baos, byteOrder);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java Tue Nov 26 21:08:17 2013
@@ -100,11 +100,11 @@ public final class MyLzwDecompressor {
return Code < codes;
}
- private byte firstChar(final byte bytes[]) {
+ private byte firstChar(final byte[] bytes) {
return bytes[0];
}
- private void addStringToTable(final byte bytes[]) throws IOException {
+ private void addStringToTable(final byte[] bytes) throws IOException {
if (codes < (1 << codeSize)) {
table[codes] = bytes;
codes++;
@@ -115,15 +115,15 @@ public final class MyLzwDecompressor {
checkCodeSize();
}
- private byte[] appendBytes(final byte bytes[], final byte b) {
- final byte result[] = new byte[bytes.length + 1];
+ private byte[] appendBytes(final byte[] bytes, final byte b) {
+ final byte[] result = new byte[bytes.length + 1];
System.arraycopy(bytes, 0, result, 0, bytes.length);
result[result.length - 1] = b;
return result;
}
- private void writeToResult(final OutputStream os, final byte bytes[])
+ private void writeToResult(final OutputStream os, final byte[] bytes)
throws IOException {
os.write(bytes);
written += bytes.length;
@@ -169,10 +169,10 @@ public final class MyLzwDecompressor {
firstChar(stringFromCode(code))));
oldCode = code;
} else {
- final byte OutString[] = appendBytes(stringFromCode(oldCode),
+ final byte[] outString = appendBytes(stringFromCode(oldCode),
firstChar(stringFromCode(oldCode)));
- writeToResult(baos, OutString);
- addStringToTable(OutString);
+ writeToResult(baos, outString);
+ addStringToTable(outString);
oldCode = code;
}
} // end of not-ClearCode case
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Tue Nov 26 21:08:17 2013
@@ -55,8 +55,8 @@ import org.apache.commons.imaging.util.I
public class BmpImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".bmp";
- private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
- private static final byte BMP_HEADER_SIGNATURE[] = { 0x42, 0x4d, };
+ private static final String[] ACCEPTED_EXTENSIONS = { DEFAULT_EXTENSION, };
+ private static final byte[] BMP_HEADER_SIGNATURE = { 0x42, 0x4d, };
private static final int BI_RGB = 0;
private static final int BI_RLE4 = 2;
private static final int BI_RLE8 = 1;
@@ -250,14 +250,13 @@ public class BmpImageParser extends Imag
}
}
- final BmpHeaderInfo result = new BmpHeaderInfo(identifier1, identifier2,
+ return new BmpHeaderInfo(identifier1, identifier2,
fileSize, reserved, bitmapDataOffset, bitmapHeaderSize, width,
height, planes, bitsPerPixel, compression, bitmapDataSize,
hResolution, vResolution, colorsUsed, colorsImportant, redMask,
greenMask, blueMask, alphaMask, colorSpaceType, colorSpace,
gammaRed, gammaGreen, gammaBlue, intent, profileData,
profileSize, reservedV5);
- return result;
}
private byte[] getRLEBytes(final InputStream is, final int RLESamplesPerByte)
@@ -307,7 +306,7 @@ public class BmpImageParser extends Imag
// RLESamplesPerByte);
// System.out.println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
// );
- final byte bytes[] = this.readBytes("bytes", is, size,
+ final byte[] bytes = this.readBytes("bytes", is, size,
"RLE: Absolute Mode");
baos.write(bytes);
}
@@ -402,7 +401,7 @@ public class BmpImageParser extends Imag
+ bhi.compression);
}
- byte colorTable[] = null;
+ byte[] colorTable = null;
if (paletteLength > 0) {
colorTable = this.readBytes("ColorTable", is, paletteLength,
"Not a Valid BMP File");
@@ -462,7 +461,7 @@ public class BmpImageParser extends Imag
debugNumber("imageDataSize", imageDataSize, 4);
}
- byte imageData[];
+ byte[] imageData;
if (rle) {
imageData = getRLEBytes(is, rleSamplesPerByte);
} else {
@@ -544,12 +543,12 @@ public class BmpImageParser extends Imag
}
- public byte[] embedICCProfile(final byte image[], final byte profile[]) {
+ public byte[] embedICCProfile(final byte[] image, final byte[] profile) {
return null;
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
@@ -615,7 +614,7 @@ public class BmpImageParser extends Imag
}
final BmpHeaderInfo bhi = ic.bhi;
- final byte colorTable[] = ic.colorTable;
+ final byte[] colorTable = ic.colorTable;
if (bhi == null) {
throw new ImageReadException("BMP: couldn't read header");
@@ -789,7 +788,7 @@ public class BmpImageParser extends Imag
writer = new BmpWriterPalette(palette);
}
- final byte imagedata[] = writer.getImageData(src);
+ final byte[] imagedata = writer.getImageData(src);
final BinaryOutputStream bos = new BinaryOutputStream(os, ByteOrder.LITTLE_ENDIAN);
// write BitmapFileHeader
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java Tue Nov 26 21:08:17 2013
@@ -20,12 +20,12 @@ import org.apache.commons.imaging.format
class ImageContents {
public final BmpHeaderInfo bhi;
- public final byte colorTable[];
- public final byte imageData[];
+ public final byte[] colorTable;
+ public final byte[] imageData;
public final PixelParser pixelParser;
- public ImageContents(final BmpHeaderInfo bhi, final byte ColorTable[],
- final byte ImageData[], final PixelParser fPixelParser) {
+ public ImageContents(final BmpHeaderInfo bhi, final byte[] ColorTable,
+ final byte[] ImageData, final PixelParser fPixelParser) {
this.bhi = bhi;
this.colorTable = ColorTable;
this.imageData = ImageData;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java Tue Nov 26 21:08:17 2013
@@ -27,17 +27,17 @@ import org.apache.commons.imaging.format
public abstract class PixelParser {
public final BmpHeaderInfo bhi;
- public final byte colorTable[];
- public final byte imageData[];
+ public final byte[] colorTable;
+ public final byte[] imageData;
protected final BinaryInputStream is;
- public PixelParser(final BmpHeaderInfo bhi, final byte ColorTable[], final byte ImageData[]) {
+ public PixelParser(final BmpHeaderInfo bhi, final byte[] colorTable, final byte[] imageData) {
this.bhi = bhi;
- this.colorTable = ColorTable;
- this.imageData = ImageData;
+ this.colorTable = colorTable;
+ this.imageData = imageData;
- is = new BinaryInputStream(new ByteArrayInputStream(ImageData), ByteOrder.LITTLE_ENDIAN);
+ is = new BinaryInputStream(new ByteArrayInputStream(imageData), ByteOrder.LITTLE_ENDIAN);
}
public abstract void processImage(ImageBuilder imageBuilder)
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java Tue Nov 26 21:08:17 2013
@@ -35,9 +35,8 @@ public class PixelParserBitFields extend
private int bytecount = 0;
- public PixelParserBitFields(final BmpHeaderInfo bhi, final byte ColorTable[],
- final byte ImageData[]) {
- super(bhi, ColorTable, ImageData);
+ public PixelParserBitFields(final BmpHeaderInfo bhi, final byte[] colorTable, final byte[] imageData) {
+ super(bhi, colorTable, imageData);
redMask = bhi.redMask;
greenMask = bhi.greenMask;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java Tue Nov 26 21:08:17 2013
@@ -27,9 +27,9 @@ public class PixelParserRgb extends Pixe
private int cached_byte = 0;
int pixelCount = 0;
- public PixelParserRgb(final BmpHeaderInfo bhi, final byte ColorTable[],
- final byte ImageData[]) {
- super(bhi, ColorTable, ImageData);
+ public PixelParserRgb(final BmpHeaderInfo bhi, final byte[] colorTable,
+ final byte[] imageData) {
+ super(bhi, colorTable, imageData);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java Tue Nov 26 21:08:17 2013
@@ -24,9 +24,9 @@ import org.apache.commons.imaging.format
public class PixelParserRle extends PixelParser {
- public PixelParserRle(final BmpHeaderInfo bhi, final byte ColorTable[],
- final byte ImageData[]) {
- super(bhi, ColorTable, ImageData);
+ public PixelParserRle(final BmpHeaderInfo bhi, final byte[] colorTable,
+ final byte[] imageData) {
+ super(bhi, colorTable, imageData);
}
@@ -42,7 +42,7 @@ public class PixelParserRle extends Pixe
}
private int[] convertDataToSamples(final int data) throws ImageReadException {
- int rgbs[];
+ int[] rgbs;
if (bhi.bitsPerPixel == 8) {
rgbs = new int[1];
rgbs[0] = getColorTableRGB(data);
@@ -62,7 +62,7 @@ public class PixelParserRle extends Pixe
return rgbs;
}
- private int processByteOfData(final int rgbs[], final int repeat, int x, final int y,
+ private int processByteOfData(final int[] rgbs, final int repeat, int x, final int y,
final int width, final int height, final ImageBuilder imageBuilder) {
// int rbg
int pixels_written = 0;
@@ -133,14 +133,14 @@ public class PixelParserRle extends Pixe
// System.out.println("size: " + size);
// System.out.println("SamplesPerByte: " + SamplesPerByte);
- final byte bytes[] = is.readBytes("bytes", size,
+ final byte[] bytes = is.readBytes("bytes", size,
"RLE: Absolute Mode");
int remaining = b;
for (int i = 0; remaining > 0; i++) {
// for (int i = 0; i < bytes.length; i++)
- final int samples[] = convertDataToSamples(0xff & bytes[i]);
+ final int[] samples = convertDataToSamples(0xff & bytes[i]);
final int towrite = Math.min(remaining, SamplesPerByte);
// System.out.println("remaining: " + remaining);
// System.out.println("SamplesPerByte: "
@@ -157,7 +157,7 @@ public class PixelParserRle extends Pixe
}
}
} else {
- final int rgbs[] = convertDataToSamples(b);
+ final int[] rgbs = convertDataToSamples(b);
x += processByteOfData(rgbs, a, x, y, width, height,
imageBuilder);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java Tue Nov 26 21:08:17 2013
@@ -23,9 +23,8 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
public abstract class PixelParserSimple extends PixelParser {
- public PixelParserSimple(final BmpHeaderInfo bhi, final byte ColorTable[],
- final byte ImageData[]) {
- super(bhi, ColorTable, ImageData);
+ public PixelParserSimple(final BmpHeaderInfo bhi, final byte[] colorTable, final byte[] imageData) {
+ super(bhi, colorTable, imageData);
}
public abstract int getNextRGB() throws ImageReadException, IOException;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Tue Nov 26 21:08:17 2013
@@ -47,7 +47,7 @@ import org.apache.commons.imaging.util.I
public class DcxImageParser extends ImageParser {
// See http://www.fileformat.info/format/pcx/egff.htm for documentation
private static final String DEFAULT_EXTENSION = ".dcx";
- private static final String ACCEPTED_EXTENSIONS[] = { ".dcx", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".dcx", };
public DcxImageParser() {
super.setByteOrder(ByteOrder.LITTLE_ENDIAN);
@@ -76,7 +76,7 @@ public class DcxImageParser extends Imag
}
@Override
- public boolean embedICCProfile(final File src, final File dst, final byte profile[]) {
+ public boolean embedICCProfile(final File src, final File dst, final byte[] profile) {
return false;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java Tue Nov 26 21:08:17 2013
@@ -38,7 +38,7 @@ class GenericGifBlock extends GifBlock {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
for (int i = 0; i < subblocks.size(); i++) {
- final byte subblock[] = subblocks.get(i);
+ final byte[] subblock = subblocks.get(i);
if (includeLengths && i > 0) {
out.write(subblock.length);
}