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 [3/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...
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java Tue Nov 26 21:08:17 2013
@@ -24,21 +24,24 @@ public class PngChunk extends BinaryFile
public final int length;
public final int chunkType;
public final int crc;
- private final byte bytes[];
+ private final byte[] bytes;
- private final boolean propertyBits[];
- public final boolean ancillary, isPrivate, reserved, safeToCopy;
-
- public PngChunk(final int Length, final int ChunkType, final int CRC, final byte bytes[]) {
- this.length = Length;
- this.chunkType = ChunkType;
+ private final boolean[] propertyBits;
+ public final boolean ancillary;
+ public final boolean isPrivate;
+ public final boolean reserved;
+ public final boolean safeToCopy;
+
+ public PngChunk(final int length, final int chunkType, final int CRC, final byte[] bytes) {
+ this.length = length;
+ this.chunkType = chunkType;
this.crc = CRC;
this.bytes = bytes;
propertyBits = new boolean[4];
int shift = 24;
for (int i = 0; i < 4; i++) {
- final int theByte = 0xff & (ChunkType >> shift);
+ final int theByte = 0xff & (chunkType >> shift);
shift -= 8;
final int theMask = 1 << 5;
propertyBits[i] = ((theByte & theMask) > 0);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java Tue Nov 26 21:08:17 2013
@@ -20,18 +20,18 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
public class PngChunkGama extends PngChunk {
- public final int Gamma;
+ public final int gamma;
- public PngChunkGama(final int Length, final int ChunkType, final int CRC, final byte bytes[])
+ public PngChunkGama(final int length, final int chunkType, final int CRC, final byte[] bytes)
throws IOException {
- super(Length, ChunkType, CRC, bytes);
+ super(length, chunkType, CRC, bytes);
final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
- Gamma = read4Bytes("Gamma", is, "Not a Valid Png File: gAMA Corrupt");
+ gamma = read4Bytes("Gamma", is, "Not a Valid Png File: gAMA Corrupt");
}
public double getGamma() {
- return 1.0 / (Gamma / 100000.0);
+ return 1.0 / (gamma / 100000.0);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java Tue Nov 26 21:08:17 2013
@@ -25,45 +25,42 @@ import org.apache.commons.imaging.common
public class PngChunkIccp extends PngChunk {
// private final PngImageParser parser;
- public final String ProfileName;
- public final int CompressionMethod;
- public final byte CompressedProfile[];
- public final byte UncompressedProfile[];
+ public final String profileName;
+ public final int compressionMethod;
+ public final byte[] compressedProfile;
+ public final byte[] uncompressedProfile;
public PngChunkIccp(
// PngImageParser parser,
- final int Length, final int ChunkType, final int CRC, final byte bytes[])
+ final int length, final int chunkType, final int CRC, final byte[] bytes)
throws ImageReadException, IOException {
- super(Length, ChunkType, CRC, bytes);
+ super(length, chunkType, CRC, bytes);
// this.parser = parser;
final int index = findNull(bytes);
if (index < 0) {
throw new ImageReadException("PngChunkIccp: No Profile Name");
}
- final byte name_bytes[] = new byte[index];
+ final byte[] name_bytes = new byte[index];
System.arraycopy(bytes, 0, name_bytes, 0, index);
- ProfileName = new String(name_bytes, "ISO-8859-1");
+ profileName = new String(name_bytes, "ISO-8859-1");
- CompressionMethod = bytes[index + 1];
+ compressionMethod = bytes[index + 1];
final int CompressedProfileLength = bytes.length - (index + 1 + 1);
- CompressedProfile = new byte[CompressedProfileLength];
- System.arraycopy(bytes, index + 1 + 1, CompressedProfile, 0,
- CompressedProfileLength);
+ compressedProfile = new byte[CompressedProfileLength];
+ System.arraycopy(bytes, index + 1 + 1, compressedProfile, 0, CompressedProfileLength);
if (getDebug()) {
- System.out.println("ProfileName: " + ProfileName);
- System.out.println("ProfileName.length(): "
- + ProfileName.length());
- System.out.println("CompressionMethod: " + CompressionMethod);
- System.out.println("CompressedProfileLength: "
- + CompressedProfileLength);
+ System.out.println("ProfileName: " + profileName);
+ System.out.println("ProfileName.length(): " + profileName.length());
+ System.out.println("CompressionMethod: " + compressionMethod);
+ System.out.println("CompressedProfileLength: " + CompressedProfileLength);
System.out.println("bytes.length: " + bytes.length);
}
- UncompressedProfile = BinaryFunctions.getStreamBytes(
- new InflaterInputStream(new ByteArrayInputStream(CompressedProfile)));
+ uncompressedProfile = BinaryFunctions.getStreamBytes(
+ new InflaterInputStream(new ByteArrayInputStream(compressedProfile)));
if (getDebug()) {
System.out.println("UncompressedProfile: " + Integer.toString(bytes.length));
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java Tue Nov 26 21:08:17 2013
@@ -17,7 +17,7 @@
package org.apache.commons.imaging.formats.png.chunks;
public class PngChunkIdat extends PngChunk {
- public PngChunkIdat(final int Length, final int ChunkType, final int CRC, final byte bytes[]) {
- super(Length, ChunkType, CRC, bytes);
+ public PngChunkIdat(final int length, final int chunkType, final int CRC, final byte[] bytes) {
+ super(length, chunkType, CRC, bytes);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java Tue Nov 26 21:08:17 2013
@@ -28,22 +28,17 @@ public class PngChunkIhdr extends PngChu
public final int filterMethod;
public final int interlaceMethod;
- public PngChunkIhdr(final int Length, final int ChunkType, final int CRC, final byte bytes[])
+ public PngChunkIhdr(final int length, final int chunkType, final int CRC, final byte[] bytes)
throws IOException {
- super(Length, ChunkType, CRC, bytes);
+ super(length, chunkType, CRC, bytes);
final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
width = read4Bytes("Width", is, "Not a Valid Png File: IHDR Corrupt");
height = read4Bytes("Height", is, "Not a Valid Png File: IHDR Corrupt");
- bitDepth = readByte("BitDepth", is,
- "Not a Valid Png File: IHDR Corrupt");
- colorType = readByte("ColorType", is,
- "Not a Valid Png File: IHDR Corrupt");
- compressionMethod = readByte("CompressionMethod", is,
- "Not a Valid Png File: IHDR Corrupt");
- filterMethod = readByte("FilterMethod", is,
- "Not a Valid Png File: IHDR Corrupt");
- interlaceMethod = readByte("InterlaceMethod", is,
- "Not a Valid Png File: IHDR Corrupt");
+ bitDepth = readByte("BitDepth", is, "Not a Valid Png File: IHDR Corrupt");
+ colorType = readByte("ColorType", is, "Not a Valid Png File: IHDR Corrupt");
+ compressionMethod = readByte("CompressionMethod", is, "Not a Valid Png File: IHDR Corrupt");
+ filterMethod = readByte("FilterMethod", is, "Not a Valid Png File: IHDR Corrupt");
+ interlaceMethod = readByte("InterlaceMethod", is, "Not a Valid Png File: IHDR Corrupt");
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java Tue Nov 26 21:08:17 2013
@@ -26,7 +26,8 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.png.PngText;
public class PngChunkItxt extends PngTextChunk {
- public final String keyword, text;
+ public final String keyword;
+ public final String text;
/*
* The language tag defined in [RFC-3066] indicates the human language used
@@ -41,7 +42,7 @@ public class PngChunkItxt extends PngTex
public final String translatedKeyword;
- public PngChunkItxt(final int length, final int chunkType, final int crc, final byte bytes[])
+ public PngChunkItxt(final int length, final int chunkType, final int crc, final byte[] bytes)
throws ImageReadException, IOException {
super(length, chunkType, crc, bytes);
int terminator = findNull(bytes);
@@ -69,33 +70,28 @@ public class PngChunkItxt extends PngTex
terminator = findNull(bytes, index);
if (terminator < 0) {
- throw new ImageReadException(
- "PNG iTXt chunk language tag is not terminated.");
+ throw new ImageReadException("PNG iTXt chunk language tag is not terminated.");
}
- languageTag = new String(bytes, index, terminator - index,
- "ISO-8859-1");
+ languageTag = new String(bytes, index, terminator - index, "ISO-8859-1");
index = terminator + 1;
terminator = findNull(bytes, index);
if (terminator < 0) {
- throw new ImageReadException(
- "PNG iTXt chunk translated keyword is not terminated.");
+ throw new ImageReadException("PNG iTXt chunk translated keyword is not terminated.");
}
- translatedKeyword = new String(bytes, index, terminator - index,
- "utf-8");
+ translatedKeyword = new String(bytes, index, terminator - index, "utf-8");
index = terminator + 1;
if (compressed) {
final int compressedTextLength = bytes.length - index;
- final byte compressedText[] = new byte[compressedTextLength];
- System.arraycopy(bytes, index, compressedText, 0,
- compressedTextLength);
+ final byte[] compressedText = new byte[compressedTextLength];
+ System.arraycopy(bytes, index, compressedText, 0, compressedTextLength);
- text = new String(BinaryFunctions.getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(bytes))),
- "utf-8");
+ text = new String(BinaryFunctions.getStreamBytes(
+ new InflaterInputStream(new ByteArrayInputStream(compressedText))), "utf-8");
} else {
text = new String(bytes, index, bytes.length - index, "utf-8");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java Tue Nov 26 21:08:17 2013
@@ -20,22 +20,19 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
public class PngChunkPhys extends PngChunk {
- public final int PixelsPerUnitXAxis;
- public final int PixelsPerUnitYAxis;
- public final int UnitSpecifier;
+ public final int pixelsPerUnitXAxis;
+ public final int pixelsPerUnitYAxis;
+ public final int unitSpecifier;
- public PngChunkPhys(final int Length, final int ChunkType, final int CRC, final byte bytes[])
+ public PngChunkPhys(final int Length, final int ChunkType, final int CRC, final byte[] bytes)
throws IOException {
super(Length, ChunkType, CRC, bytes);
final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
- PixelsPerUnitXAxis = read4Bytes("PixelsPerUnitXAxis", is,
- "Not a Valid Png File: pHYs Corrupt");
- PixelsPerUnitYAxis = read4Bytes("PixelsPerUnitYAxis", is,
- "Not a Valid Png File: pHYs Corrupt");
- UnitSpecifier = readByte("Unit specifier", is,
- "Not a Valid Png File: pHYs Corrupt");
+ pixelsPerUnitXAxis = read4Bytes("PixelsPerUnitXAxis", is, "Not a Valid Png File: pHYs Corrupt");
+ pixelsPerUnitYAxis = read4Bytes("PixelsPerUnitYAxis", is, "Not a Valid Png File: pHYs Corrupt");
+ unitSpecifier = readByte("Unit specifier", is, "Not a Valid Png File: pHYs Corrupt");
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java Tue Nov 26 21:08:17 2013
@@ -23,9 +23,9 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.formats.png.GammaCorrection;
public class PngChunkPlte extends PngChunk {
- private final int rgb[];
+ private final int[] rgb;
- public PngChunkPlte(final int length, final int ChunkType, final int CRC, final byte bytes[])
+ public PngChunkPlte(final int length, final int ChunkType, final int CRC, final byte[] bytes)
throws ImageReadException, IOException {
super(length, ChunkType, CRC, bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java Tue Nov 26 21:08:17 2013
@@ -22,9 +22,10 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.formats.png.PngText;
public class PngChunkText extends PngTextChunk {
- public final String keyword, text;
+ public final String keyword;
+ public final String text;
- public PngChunkText(final int length, final int chunkType, final int crc, final byte bytes[])
+ public PngChunkText(final int length, final int chunkType, final int crc, final byte[] bytes)
throws ImageReadException, IOException {
super(length, chunkType, crc, bytes);
final int index = findNull(bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java Tue Nov 26 21:08:17 2013
@@ -27,9 +27,10 @@ import org.apache.commons.imaging.format
public class PngChunkZtxt extends PngTextChunk {
- public final String keyword, text;
+ public final String keyword;
+ public final String text;
- public PngChunkZtxt(final int length, final int chunkType, final int crc, final byte bytes[])
+ public PngChunkZtxt(final int length, final int chunkType, final int crc, final byte[] bytes)
throws ImageReadException, IOException {
super(length, chunkType, crc, bytes);
@@ -50,7 +51,7 @@ public class PngChunkZtxt extends PngTex
}
final int compressedTextLength = bytes.length - index;
- final byte compressedText[] = new byte[compressedTextLength];
+ final byte[] compressedText = new byte[compressedTextLength];
System.arraycopy(bytes, index, compressedText, 0, compressedTextLength);
text = new String(BinaryFunctions.getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(compressedText))), "ISO-8859-1");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java Tue Nov 26 21:08:17 2013
@@ -20,8 +20,8 @@ import org.apache.commons.imaging.format
public abstract class PngTextChunk extends PngChunk {
- public PngTextChunk(final int Length, final int ChunkType, final int CRC, final byte bytes[]) {
- super(Length, ChunkType, CRC, bytes);
+ public PngTextChunk(final int Length, final int chunkType, final int CRC, final byte[] bytes) {
+ super(Length, chunkType, CRC, bytes);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java Tue Nov 26 21:08:17 2013
@@ -21,6 +21,6 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
public abstract class ScanlineFilter {
- public abstract void unfilter(byte src[], byte dst[], byte up[])
+ public abstract void unfilter(byte[] src, byte[] dst, byte[] up)
throws ImageReadException, IOException;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java Tue Nov 26 21:08:17 2013
@@ -21,20 +21,20 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
public class ScanlineFilterAverage extends ScanlineFilter {
- private final int BytesPerPixel;
+ private final int bytesPerPixel;
- public ScanlineFilterAverage(final int BytesPerPixel) {
- this.BytesPerPixel = BytesPerPixel;
+ public ScanlineFilterAverage(final int bytesPerPixel) {
+ this.bytesPerPixel = bytesPerPixel;
}
@Override
- public void unfilter(final byte src[], final byte dst[], final byte up[])
+ public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
- int Raw = 0;
- final int prev_index = i - BytesPerPixel;
+ int raw = 0;
+ final int prev_index = i - bytesPerPixel;
if (prev_index >= 0) {
- Raw = dst[prev_index];
+ raw = dst[prev_index];
}
int Prior = 0;
@@ -42,7 +42,7 @@ public class ScanlineFilterAverage exten
Prior = up[i];
}
- final int Average = ((0xff & Raw) + (0xff & Prior)) / 2;
+ final int Average = ((0xff & raw) + (0xff & Prior)) / 2;
dst[i] = (byte) ((src[i] + Average) % 256);
// dst[i] = src[i];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java Tue Nov 26 21:08:17 2013
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.ImageR
public class ScanlineFilterNone extends ScanlineFilter {
@Override
- public void unfilter(final byte src[], final byte dst[], final byte up[])
+ public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
System.arraycopy(src, 0, dst, 0, src.length);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java Tue Nov 26 21:08:17 2013
@@ -21,10 +21,10 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
public class ScanlineFilterPaeth extends ScanlineFilter {
- private final int BytesPerPixel;
+ private final int bytesPerPixel;
- public ScanlineFilterPaeth(final int BytesPerPixel) {
- this.BytesPerPixel = BytesPerPixel;
+ public ScanlineFilterPaeth(final int bytesPerPixel) {
+ this.bytesPerPixel = bytesPerPixel;
}
private int PaethPredictor(final int a, final int b, final int c) {
@@ -45,11 +45,11 @@ public class ScanlineFilterPaeth extends
}
@Override
- public void unfilter(final byte src[], final byte dst[], final byte up[])
+ public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
int left = 0;
- final int prev_index = i - BytesPerPixel;
+ final int prev_index = i - bytesPerPixel;
if (prev_index >= 0) {
left = dst[prev_index];
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java Tue Nov 26 21:08:17 2013
@@ -21,17 +21,17 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
public class ScanlineFilterSub extends ScanlineFilter {
- private final int BytesPerPixel;
+ private final int bytesPerPixel;
- public ScanlineFilterSub(final int BytesPerPixel) {
- this.BytesPerPixel = BytesPerPixel;
+ public ScanlineFilterSub(final int bytesPerPixel) {
+ this.bytesPerPixel = bytesPerPixel;
}
@Override
- public void unfilter(final byte src[], final byte dst[], final byte up[])
+ public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
- final int prev_index = i - BytesPerPixel;
+ final int prev_index = i - bytesPerPixel;
if (prev_index >= 0) {
dst[i] = (byte) ((src[i] + dst[prev_index]) % 256);
// dst[i] = 0xff & (src[i] + src[prev_index]);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java Tue Nov 26 21:08:17 2013
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.ImageR
public class ScanlineFilterUp extends ScanlineFilter {
@Override
- public void unfilter(final byte src[], final byte dst[], final byte up[])
+ public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
// byte b;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilter.java Tue Nov 26 21:08:17 2013
@@ -22,9 +22,9 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.common.BinaryFileParser;
public abstract class TransparencyFilter extends BinaryFileParser {
- protected final byte bytes[];
+ protected final byte[] bytes;
- public TransparencyFilter(final byte bytes[]) {
+ public TransparencyFilter(final byte[] bytes) {
this.bytes = bytes;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java Tue Nov 26 21:08:17 2013
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageR
public class TransparencyFilterGrayscale extends TransparencyFilter {
private final int transparent_color;
- public TransparencyFilterGrayscale(final byte bytes[]) throws IOException {
+ public TransparencyFilterGrayscale(final byte[] bytes) throws IOException {
super(bytes);
final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColor.java Tue Nov 26 21:08:17 2013
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.ImageR
public class TransparencyFilterIndexedColor extends TransparencyFilter {
- public TransparencyFilterIndexedColor(final byte bytes[]) {
+ public TransparencyFilterIndexedColor(final byte[] bytes) {
super(bytes);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java Tue Nov 26 21:08:17 2013
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageR
public class TransparencyFilterTrueColor extends TransparencyFilter {
private final int transparent_color;
- public TransparencyFilterTrueColor(final byte bytes[]) throws IOException {
+ public TransparencyFilterTrueColor(final byte[] bytes) throws IOException {
super(bytes);
final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Tue Nov 26 21:08:17 2013
@@ -44,7 +44,7 @@ import org.apache.commons.imaging.util.I
public class PnmImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".pnm";
- private static final String ACCEPTED_EXTENSIONS[] = { ".pbm", ".pgm",
+ private static final String[] ACCEPTED_EXTENSIONS = { ".pbm", ".pgm",
".ppm", ".pnm", ".pam" };
public static final String PARAM_KEY_PNM_RAWBITS = "PNM_RAWBITS";
public static final String PARAM_VALUE_PNM_RAWBITS_YES = "YES";
@@ -216,12 +216,12 @@ public class PnmImageParser extends Imag
return new Dimension(info.width, info.height);
}
- 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;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java Tue Nov 26 21:08:17 2013
@@ -22,13 +22,13 @@ import org.apache.commons.imaging.util.D
class ImageResourceBlock {
protected final int id;
- protected final byte nameData[];
- protected final byte data[];
+ protected final byte[] nameData;
+ protected final byte[] data;
- public ImageResourceBlock(final int ID, final byte NameData[], final byte Data[]) {
- this.id = ID;
- this.nameData = NameData;
- this.data = Data;
+ public ImageResourceBlock(final int id, final byte[] nameData, final byte[] data) {
+ this.id = id;
+ this.nameData = nameData;
+ this.data = data;
}
public String getName() throws UnsupportedEncodingException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java Tue Nov 26 21:08:17 2013
@@ -19,19 +19,19 @@ package org.apache.commons.imaging.forma
import org.apache.commons.imaging.ImageReadException;
public class ImageResourceType {
- public final int ID;
- public final String Description;
+ public final int id;
+ public final String description;
- public ImageResourceType(final int ID, final String Description) {
- this.ID = ID;
- this.Description = Description;
+ public ImageResourceType(final int id, final String Description) {
+ this.id = id;
+ this.description = Description;
}
- public ImageResourceType(final int ID, final int ID2, final String Description)
+ public ImageResourceType(final int id, final int id2, final String Description)
throws ImageReadException {
- this(ID, Description);
- if (ID != ID2) {
- throw new ImageReadException("Mismatch ID: " + ID + " ID2: " + ID2);
+ this(id, Description);
+ if (id != id2) {
+ throw new ImageReadException("Mismatch ID: " + id + " ID2: " + id2);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java Tue Nov 26 21:08:17 2013
@@ -19,19 +19,19 @@ package org.apache.commons.imaging.forma
import org.apache.commons.imaging.util.Debug;
public class PsdConstants {
- static final ImageResourceType fImageResourceTypes[];
+ static final ImageResourceType[] IMAGE_RESOURCE_TYPES;
public String getDescription(final int id) {
- for (final ImageResourceType fImageResourceType : fImageResourceTypes) {
- if (fImageResourceType.ID == id) {
- return fImageResourceType.Description;
+ for (final ImageResourceType imageResourceType : IMAGE_RESOURCE_TYPES) {
+ if (imageResourceType.id == id) {
+ return imageResourceType.description;
}
}
return "Unknown";
}
static {
- ImageResourceType temp[] = null;
+ ImageResourceType[] temp = null;
try {
temp = new ImageResourceType[] {
@@ -192,6 +192,6 @@ public class PsdConstants {
} catch (final Exception e) {
Debug.debug(PsdConstants.class.getName(), e);
}
- fImageResourceTypes = temp;
+ IMAGE_RESOURCE_TYPES = temp;
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java Tue Nov 26 21:08:17 2013
@@ -22,14 +22,14 @@ import java.nio.charset.Charset;
public class PsdHeaderInfo {
public final int Version;
- private final byte Reserved[];
+ private final byte[] Reserved;
public final int Channels;
public final int Rows;
public final int Columns;
public final int Depth;
public final int Mode;
- public PsdHeaderInfo(final int Version, final byte Reserved[], final int Channels, final int Rows,
+ public PsdHeaderInfo(final int Version, final byte[] Reserved, final int Channels, final int Rows,
final int Columns, final int Depth, final int Mode) {
this.Version = Version;
this.Reserved = Reserved;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Tue Nov 26 21:08:17 2013
@@ -50,7 +50,7 @@ import org.apache.commons.imaging.util.I
public class PsdImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".psd";
- private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ private static final String[] ACCEPTED_EXTENSIONS = { DEFAULT_EXTENSION, };
private static final int PSD_SECTION_HEADER = 0;
private static final int PSD_SECTION_COLOR_MODE = 1;
private static final int PSD_SECTION_IMAGE_RESOURCES = 2;
@@ -110,7 +110,7 @@ public class PsdImageParser extends Imag
final int Version = read2Bytes("Version", is, "Not a Valid PSD File");
- final byte Reserved[] = readBytes("Reserved", is, 6,
+ final byte[] Reserved = readBytes("Reserved", is, 6,
"Not a Valid PSD File");
final int Channels = read2Bytes("Channels", is, "Not a Valid PSD File");
@@ -164,14 +164,14 @@ public class PsdImageParser extends Imag
Compression);
}
- private List<ImageResourceBlock> readImageResourceBlocks(final byte bytes[],
- final int imageResourceIDs[], final int maxBlocksToRead)
+ private List<ImageResourceBlock> readImageResourceBlocks(final byte[] bytes,
+ final int[] imageResourceIDs, final int maxBlocksToRead)
throws ImageReadException, IOException {
return readImageResourceBlocks(new ByteArrayInputStream(bytes),
imageResourceIDs, maxBlocksToRead, bytes.length);
}
- private boolean keepImageResourceBlock(final int ID, final int imageResourceIDs[]) {
+ private boolean keepImageResourceBlock(final int ID, final int[] imageResourceIDs) {
if (imageResourceIDs == null) {
return true;
}
@@ -186,7 +186,7 @@ public class PsdImageParser extends Imag
}
private List<ImageResourceBlock> readImageResourceBlocks(final InputStream is,
- final int imageResourceIDs[], final int maxBlocksToRead, int available)
+ final int[] imageResourceIDs, final int maxBlocksToRead, int available)
throws ImageReadException, IOException {
final List<ImageResourceBlock> result = new ArrayList<ImageResourceBlock>();
@@ -201,7 +201,7 @@ public class PsdImageParser extends Imag
final int nameLength = readByte("NameLength", is, "Not a Valid PSD File");
available -= 1;
- final byte nameBytes[] = readBytes("NameData", is, nameLength,
+ final byte[] nameBytes = readBytes("NameData", is, nameLength,
"Not a Valid PSD File");
available -= nameLength;
if (((nameLength + 1) % 2) != 0) {
@@ -211,25 +211,23 @@ public class PsdImageParser extends Imag
available -= 1;
}
// String Name = readPString("Name", 6, is, "Not a Valid PSD File");
- final int DataSize = read4Bytes("Size", is, "Not a Valid PSD File");
+ final int dataSize = read4Bytes("Size", is, "Not a Valid PSD File");
available -= 4;
// int ActualDataSize = ((DataSize % 2) == 0)
// ? DataSize
// : DataSize + 1; // pad to make even
- final byte Data[] = readBytes("Data", is, DataSize,
- "Not a Valid PSD File");
- available -= DataSize;
+ final byte[] data = readBytes("Data", is, dataSize, "Not a Valid PSD File");
+ available -= dataSize;
- if ((DataSize % 2) != 0) {
+ if ((dataSize % 2) != 0) {
//final int DataDiscard =
- readByte("DataDiscard", is,
- "Not a Valid PSD File");
+ readByte("DataDiscard", is, "Not a Valid PSD File");
available -= 1;
}
if (keepImageResourceBlock(id, imageResourceIDs)) {
- result.add(new ImageResourceBlock(id, nameBytes, Data));
+ result.add(new ImageResourceBlock(id, nameBytes, data));
if ((maxBlocksToRead >= 0)
&& (result.size() >= maxBlocksToRead)) {
@@ -244,7 +242,7 @@ public class PsdImageParser extends Imag
}
private List<ImageResourceBlock> readImageResourceBlocks(
- final ByteSource byteSource, final int imageResourceIDs[], final int maxBlocksToRead)
+ final ByteSource byteSource, final int[] imageResourceIDs, final int maxBlocksToRead)
throws ImageReadException, IOException {
InputStream imageStream = null;
InputStream resourceStream = null;
@@ -255,7 +253,7 @@ public class PsdImageParser extends Imag
final ImageContents imageContents = readImageContents(imageStream);
resourceStream = this.getInputStream(byteSource, PSD_SECTION_IMAGE_RESOURCES);
- final byte ImageResources[] = readBytes("ImageResources",
+ final byte[] ImageResources = readBytes("ImageResources",
resourceStream, imageContents.ImageResourcesLength,
"Not a Valid PSD File");
@@ -431,7 +429,7 @@ public class PsdImageParser extends Imag
}
final ImageResourceBlock irb = blocks.get(0);
- final byte bytes[] = irb.data;
+ final byte[] bytes = irb.data;
if ((bytes == null) || (bytes.length < 1)) {
return null;
}
@@ -450,12 +448,12 @@ public class PsdImageParser 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;
}
@@ -675,7 +673,7 @@ public class PsdImageParser extends Imag
// case 2 : // Indexed=2;
{
- final byte ColorModeData[] = getData(byteSource, PSD_SECTION_COLOR_MODE);
+ final byte[] ColorModeData = getData(byteSource, PSD_SECTION_COLOR_MODE);
// ImageResourceBlock block = findImageResourceBlock(blocks,
// 0x03EB);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java Tue Nov 26 21:08:17 2013
@@ -23,7 +23,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
public abstract class DataParser {
- public final void parseData(final int data[][][], final BufferedImage bi,
+ public final void parseData(final int[][][] data, final BufferedImage bi,
final ImageContents imageContents) {
final DataBuffer buffer = bi.getRaster().getDataBuffer();
@@ -39,8 +39,7 @@ public abstract class DataParser {
}
}
- protected abstract int getRGB(int data[][][], int x, int y,
- ImageContents imageContents);
+ protected abstract int getRGB(int[][][] data, int x, int y, ImageContents imageContents);
public abstract int getBasicChannelsCount();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java Tue Nov 26 21:08:17 2013
@@ -21,7 +21,7 @@ import org.apache.commons.imaging.format
public class DataParserBitmap extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
+ protected int getRGB(final int[][][] data, final int x, final int y,
final ImageContents imageContents) {
int sample = 0xff & data[0][y][x];
if (sample == 0) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java Tue Nov 26 21:08:17 2013
@@ -21,7 +21,7 @@ import org.apache.commons.imaging.format
public class DataParserCmyk extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
+ protected int getRGB(final int[][][] data, final int x, final int y,
final ImageContents imageContents) {
int sc = 0xff & data[0][y][x];
int sm = 0xff & data[1][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java Tue Nov 26 21:08:17 2013
@@ -20,7 +20,7 @@ import org.apache.commons.imaging.format
public class DataParserGrayscale extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
+ protected int getRGB(final int[][][] data, final int x, final int y,
final ImageContents imageContents) {
final int sample = 0xff & data[0][y][x];
final int alpha = 0xff;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java Tue Nov 26 21:08:17 2013
@@ -19,9 +19,9 @@ package org.apache.commons.imaging.forma
import org.apache.commons.imaging.formats.psd.ImageContents;
public class DataParserIndexed extends DataParser {
- private final int ColorTable[];
+ private final int[] ColorTable;
- public DataParserIndexed(final byte ColorModeData[]) {
+ public DataParserIndexed(final byte[] ColorModeData) {
ColorTable = new int[256];
for (int i = 0; i < 256; i++) {
final int red = 0xff & ColorModeData[0 * 256 + i];
@@ -37,7 +37,7 @@ public class DataParserIndexed extends D
}
@Override
- protected int getRGB(final int data[][][], final int x, final int y, final ImageContents imageContents) {
+ protected int getRGB(final int[][][] data, final int x, final int y, final ImageContents imageContents) {
final int sample = 0xff & data[0][y][x];
return ColorTable[sample];
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java Tue Nov 26 21:08:17 2013
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.format
public class DataParserLab extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y, final ImageContents imageContents) {
+ protected int getRGB(final int[][][] data, final int x, final int y, final ImageContents imageContents) {
final int cieL = 0xff & data[0][y][x];
int cieA = 0xff & data[1][y][x];
int cieB = 0xff & data[2][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java Tue Nov 26 21:08:17 2013
@@ -20,7 +20,7 @@ import org.apache.commons.imaging.format
public class DataParserRgb extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
+ protected int getRGB(final int[][][] data, final int x, final int y,
final ImageContents imageContents) {
final int red = 0xff & data[0][y][x];
final int green = 0xff & data[1][y][x];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java Tue Nov 26 21:08:17 2013
@@ -20,7 +20,7 @@ import org.apache.commons.imaging.format
public class DataParserStub extends DataParser {
@Override
- protected int getRGB(final int data[][][], final int x, final int y,
+ protected int getRGB(final int[][][] data, final int x, final int y,
final ImageContents imageContents) {
return 0;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java Tue Nov 26 21:08:17 2013
@@ -49,7 +49,7 @@ public class CompressedDataReader extend
// this.setDebug(true);
final int scanline_count = height * header.Channels;
- final int scanline_bytecounts[] = new int[scanline_count];
+ final int[] scanline_bytecounts = new int[scanline_count];
for (int i = 0; i < scanline_count; i++) {
scanline_bytecounts[i] = BinaryFunctions.read2Bytes("scanline_bytecount[" + i
+ "]", is, "PSD: bad Image Data", bfp.getByteOrder());
@@ -61,23 +61,23 @@ public class CompressedDataReader extend
final int depth = header.Depth;
final int channel_count = dataParser.getBasicChannelsCount();
- final int data[][][] = new int[channel_count][height][];
+ final int[][][] data = new int[channel_count][height][];
// channels[0] =
for (int channel = 0; channel < channel_count; channel++) {
for (int y = 0; y < height; y++) {
final int index = channel * height + y;
- final byte packed[] = BinaryFunctions.readBytes("scanline",
+ final byte[] packed = BinaryFunctions.readBytes("scanline",
is, scanline_bytecounts[index],
"PSD: Missing Image Data");
- final byte unpacked[] = new PackBits().decompress(packed, width);
+ final byte[] unpacked = new PackBits().decompress(packed, width);
final InputStream bais = new ByteArrayInputStream(unpacked);
final MyBitInputStream mbis = new MyBitInputStream(bais, ByteOrder.BIG_ENDIAN);
BitsToByteInputStream bbis = null;
boolean canThrow = false;
try {
bbis = new BitsToByteInputStream(mbis, 8); // we want all samples to be bytes
- final int scanline[] = bbis.readBitsArray(depth, width);
+ final int[] scanline = bbis.readBitsArray(depth, width);
data[channel][y] = scanline;
canThrow = true;
} finally {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Tue Nov 26 21:08:17 2013
@@ -54,7 +54,7 @@ public class UncompressedDataReader exte
try {
bbis = new BitsToByteInputStream(mbis, 8);
- final int data[][][] = new int[channel_count][height][width];
+ final int[][][] data = new int[channel_count][height][width];
for (int channel = 0; channel < channel_count; channel++) {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java Tue Nov 26 21:08:17 2013
@@ -58,7 +58,7 @@ package org.apache.commons.imaging.forma
//
// private static final String DEFAULT_EXTENSION = ".tga";
//
-// private static final String ACCEPTED_EXTENSIONS[] = {
+// private static final String[] ACCEPTED_EXTENSIONS = {
// ".tga", ".tpic",
// };
//
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java Tue Nov 26 21:08:17 2013
@@ -18,7 +18,7 @@
package org.apache.commons.imaging.formats.tiff;
public class JpegImageData extends TiffElement.DataElement {
- public JpegImageData(final long offset, final int length, final byte data[]) {
+ public JpegImageData(final long offset, final int length, final byte[] data) {
super(offset, length, data);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java Tue Nov 26 21:08:17 2013
@@ -629,8 +629,8 @@ public class TiffDirectory extends TiffE
private List<ImageDataElement> getRawImageDataElements(
final TiffField offsetsField, final TiffField byteCountsField)
throws ImageReadException {
- final int offsets[] = offsetsField.getIntArrayValue();
- final int byteCounts[] = byteCountsField.getIntArrayValue();
+ final int[] offsets = offsetsField.getIntArrayValue();
+ final int[] byteCounts = byteCountsField.getIntArrayValue();
if (offsets.length != byteCounts.length) {
throw new ImageReadException("offsets.length(" + offsets.length
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java Tue Nov 26 21:08:17 2013
@@ -45,9 +45,9 @@ public abstract class TiffElement {
public abstract String getElementDescription(boolean verbose);
public static abstract class DataElement extends TiffElement {
- public final byte data[];
+ public final byte[] data;
- public DataElement(final long offset, final int length, final byte data[]) {
+ public DataElement(final long offset, final int length, final byte[] data) {
super(offset, length);
this.data = data;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java Tue Nov 26 21:08:17 2013
@@ -325,7 +325,7 @@ public class TiffField {
final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ENGLISH);
return df.format((Date) o);
} else if (o instanceof Object[]) {
- final Object objects[] = (Object[]) o;
+ final Object[] objects = (Object[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < objects.length; i++) {
@@ -357,7 +357,7 @@ public class TiffField {
// return result.toString();
// }
} else if (o instanceof short[]) {
- final short values[] = (short[]) o;
+ final short[] values = (short[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -374,7 +374,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof int[]) {
- final int values[] = (int[]) o;
+ final int[] values = (int[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -391,7 +391,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof long[]) {
- final long values[] = (long[]) o;
+ final long[] values = (long[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -408,7 +408,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof double[]) {
- final double values[] = (double[]) o;
+ final double[] values = (double[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -425,7 +425,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof byte[]) {
- final byte values[] = (byte[]) o;
+ final byte[] values = (byte[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -442,7 +442,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof char[]) {
- final char values[] = (char[]) o;
+ final char[] values = (char[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -459,7 +459,7 @@ public class TiffField {
}
return result.toString();
} else if (o instanceof float[]) {
- final float values[] = (float[]) o;
+ final float[] values = (float[]) o;
final StringBuilder result = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -584,22 +584,22 @@ public class TiffField {
if (o instanceof Number) {
return new int[] { ((Number) o).intValue() };
} else if (o instanceof Number[]) {
- final Number numbers[] = (Number[]) o;
- final int result[] = new int[numbers.length];
+ final Number[] numbers = (Number[]) o;
+ final int[] result = new int[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = numbers[i].intValue();
}
return result;
} else if (o instanceof short[]) {
- final short numbers[] = (short[]) o;
- final int result[] = new int[numbers.length];
+ final short[] numbers = (short[]) o;
+ final int[] result = new int[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = 0xffff & numbers[i];
}
return result;
} else if (o instanceof int[]) {
- final int numbers[] = (int[]) o;
- final int result[] = new int[numbers.length];
+ final int[] numbers = (int[]) o;
+ final int[] result = new int[numbers.length];
System.arraycopy(numbers, 0, result, 0, numbers.length);
return result;
}
@@ -617,36 +617,36 @@ public class TiffField {
if (o instanceof Number) {
return new double[] { ((Number) o).doubleValue() };
} else if (o instanceof Number[]) {
- final Number numbers[] = (Number[]) o;
- final double result[] = new double[numbers.length];
+ final Number[] numbers = (Number[]) o;
+ final double[] result = new double[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = numbers[i].doubleValue();
}
return result;
} else if (o instanceof short[]) {
- final short numbers[] = (short[]) o;
- final double result[] = new double[numbers.length];
+ final short[] numbers = (short[]) o;
+ final double[] result = new double[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = numbers[i];
}
return result;
} else if (o instanceof int[]) {
- final int numbers[] = (int[]) o;
- final double result[] = new double[numbers.length];
+ final int[] numbers = (int[]) o;
+ final double[] result = new double[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = numbers[i];
}
return result;
} else if (o instanceof float[]) {
- final float numbers[] = (float[]) o;
- final double result[] = new double[numbers.length];
+ final float[] numbers = (float[]) o;
+ final double[] result = new double[numbers.length];
for (int i = 0; i < numbers.length; i++) {
result[i] = numbers[i];
}
return result;
} else if (o instanceof double[]) {
- final double numbers[] = (double[]) o;
- final double result[] = new double[numbers.length];
+ final double[] numbers = (double[]) o;
+ final double[] result = new double[numbers.length];
System.arraycopy(numbers, 0, result, 0, numbers.length);
return result;
}
@@ -664,7 +664,7 @@ public class TiffField {
if (o instanceof Number) {
return ((Number) o).intValue();
} else if (o instanceof Number[]) {
- final Number numbers[] = (Number[]) o;
+ final Number[] numbers = (Number[]) o;
int sum = 0;
for (final Number number : numbers) {
sum += number.intValue();
@@ -678,7 +678,7 @@ public class TiffField {
}
return sum;
} else if (o instanceof int[]) {
- final int numbers[] = (int[]) o;
+ final int[] numbers = (int[]) o;
int sum = 0;
for (final int number : numbers) {
sum += number;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java Tue Nov 26 21:08:17 2013
@@ -29,13 +29,13 @@ import org.apache.commons.imaging.format
public abstract class TiffImageData {
public static class Tiles extends TiffImageData {
- public final TiffElement.DataElement tiles[];
+ public final TiffElement.DataElement[] tiles;
// public final byte tiles[][];
- private final int tileWidth, tileLength;
+ private final int tileWidth;
+ private final int tileLength;
- public Tiles(final TiffElement.DataElement tiles[],
- final int tileWidth, final int tileLength) {
+ public Tiles(final TiffElement.DataElement[] tiles, final int tileWidth, final int tileLength) {
this.tiles = tiles;
this.tileWidth = tileWidth;
this.tileLength = tileLength;
@@ -54,7 +54,7 @@ public abstract class TiffImageData {
@Override
public DataReader getDataReader(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter,
- final int bitsPerPixel, final int bitsPerSample[], final int predictor,
+ final int bitsPerPixel, final int[] bitsPerSample, final int predictor,
final int samplesPerPixel, final int width, final int height, final int compression,
final ByteOrder byteOrder) throws IOException, ImageReadException {
return new DataReaderTiled(directory, photometricInterpreter,
@@ -90,12 +90,11 @@ public abstract class TiffImageData {
}
public static class Strips extends TiffImageData {
- public final TiffElement.DataElement strips[];
+ public final TiffElement.DataElement[] strips;
// public final byte strips[][];
public final int rowsPerStrip;
- public Strips(final TiffElement.DataElement strips[],
- final int rowsPerStrip) {
+ public Strips(final TiffElement.DataElement[] strips, final int rowsPerStrip) {
this.strips = strips;
this.rowsPerStrip = rowsPerStrip;
}
@@ -113,7 +112,7 @@ public abstract class TiffImageData {
@Override
public DataReader getDataReader(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter,
- final int bitsPerPixel, final int bitsPerSample[], final int predictor,
+ final int bitsPerPixel, final int[] bitsPerSample, final int predictor,
final int samplesPerPixel, final int width, final int height, final int compression,
final ByteOrder byteorder) throws IOException, ImageReadException {
return new DataReaderStrips(directory, photometricInterpreter,
@@ -136,12 +135,12 @@ public abstract class TiffImageData {
public abstract DataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter, int bitsPerPixel,
- int bitsPerSample[], int predictor, int samplesPerPixel, int width,
+ int[] bitsPerSample, int predictor, int samplesPerPixel, int width,
int height, int compression, ByteOrder byteOrder) throws IOException,
ImageReadException;
public static class Data extends TiffElement.DataElement {
- public Data(final long offset, final int length, final byte data[]) {
+ public Data(final long offset, final int length, final byte[] data) {
super(offset, length, data);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java Tue Nov 26 21:08:17 2013
@@ -153,7 +153,7 @@ public class TiffImageMetadata extends I
// Debug.debug("value", Debug.getType(value));
- final byte bytes[] = tagInfo.encodeValue(fieldType, value,
+ final byte[] bytes = tagInfo.encodeValue(fieldType, value,
byteOrder);
// if (tagInfo.isUnknown())
@@ -489,14 +489,12 @@ public class TiffImageMetadata extends I
// all of these values are strings.
final String latitudeRef = latitudeRefField.getStringValue();
- final RationalNumber latitude[] = (RationalNumber[]) latitudeField.getValue();
+ final RationalNumber[] latitude = (RationalNumber[]) latitudeField.getValue();
final String longitudeRef = longitudeRefField.getStringValue();
- final RationalNumber longitude[] = (RationalNumber[]) longitudeField
- .getValue();
+ final RationalNumber[] longitude = (RationalNumber[]) longitudeField.getValue();
if (latitude.length != 3 || longitude.length != 3) {
- throw new ImageReadException(
- "Expected three values for latitude and longitude.");
+ throw new ImageReadException("Expected three values for latitude and longitude.");
}
final RationalNumber latitudeDegrees = latitude[0];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Tue Nov 26 21:08:17 2013
@@ -56,7 +56,7 @@ import org.apache.commons.imaging.format
public class TiffImageParser extends ImageParser implements TiffConstants {
private static final String DEFAULT_EXTENSION = ".tif";
- private static final String ACCEPTED_EXTENSIONS[] = { ".tif", ".tiff", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".tif", ".tiff", };
@Override
public String getName() {
@@ -114,12 +114,12 @@ public class TiffImageParser extends Ima
return new Dimension(width, height);
}
- 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;
}
@@ -318,7 +318,7 @@ public class TiffImageParser extends Ima
.readDirectories(byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
- final byte bytes[] = directory.getFieldValue(TiffTagConstants.TIFF_TAG_XMP,
+ final byte[] bytes = directory.getFieldValue(TiffTagConstants.TIFF_TAG_XMP,
false);
if (bytes == null) {
return null;
@@ -417,7 +417,7 @@ public class TiffImageParser extends Ima
final List<ImageDataElement> dataElements = directory
.getTiffRawImageDataElements();
for (ImageDataElement element : dataElements) {
- final byte bytes[] = byteSource.getBlock(element.offset,
+ final byte[] bytes = byteSource.getBlock(element.offset,
element.length);
result.add(bytes);
}
@@ -615,7 +615,7 @@ public class TiffImageParser extends Ima
if (samplesPerPixelField != null) {
samplesPerPixel = samplesPerPixelField.getIntValue();
}
- int bitsPerSample[] = { 1 };
+ int[] bitsPerSample = { 1 };
int bitsPerPixel = samplesPerPixel;
final TiffField bitsPerSampleField = directory.findField(
TiffTagConstants.TIFF_TAG_BITS_PER_SAMPLE);
@@ -674,7 +674,7 @@ public class TiffImageParser extends Ima
private PhotometricInterpreter getPhotometricInterpreter(
final TiffDirectory directory, final int photometricInterpretation,
- final int bitsPerPixel, final int bitsPerSample[], final int predictor,
+ final int bitsPerPixel, final int[] bitsPerSample, final int predictor,
final int samplesPerPixel, final int width, final int height)
throws ImageReadException {
switch (photometricInterpretation) {
@@ -686,7 +686,7 @@ public class TiffImageParser extends Ima
bitsPerSample, predictor, width, height, invert);
case 3: // Palette
{
- final int colorMap[] = directory.findField(
+ final int[] colorMap = directory.findField(
TiffTagConstants.TIFF_TAG_COLOR_MAP, true)
.getIntArrayValue();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java Tue Nov 26 21:08:17 2013
@@ -162,8 +162,7 @@ public class TiffReader extends BinaryFi
final int tag = read2Bytes("Tag", is, "Not a Valid TIFF File");
final int type = read2Bytes("Type", is, "Not a Valid TIFF File");
final long count = 0xFFFFffffL & read4Bytes("Count", is, "Not a Valid TIFF File");
- final byte offsetBytes[] = readBytes("Offset", is, 4,
- "Not a Valid TIFF File");
+ final byte[] offsetBytes = readBytes("Offset", is, 4, "Not a Valid TIFF File");
final long offset = 0xFFFFffffL & toInt(offsetBytes);
if (tag == 0) {
@@ -434,7 +433,7 @@ public class TiffReader extends BinaryFi
final List<ImageDataElement> elements = directory
.getTiffRawImageDataElements();
- final TiffImageData.Data data[] = new TiffImageData.Data[elements.size()];
+ final TiffImageData.Data[] data = new TiffImageData.Data[elements.size()];
if (byteSource instanceof ByteSourceFile) {
final ByteSourceFile bsf = (ByteSourceFile) byteSource;
@@ -446,10 +445,8 @@ public class TiffReader extends BinaryFi
} else {
for (int i = 0; i < elements.size(); i++) {
final TiffDirectory.ImageDataElement element = elements.get(i);
- final byte bytes[] = byteSource.getBlock(element.offset,
- element.length);
- data[i] = new TiffImageData.Data(element.offset,
- element.length, bytes);
+ final byte[] bytes = byteSource.getBlock(element.offset, element.length);
+ data[i] = new TiffImageData.Data(element.offset, element.length, bytes);
}
}
@@ -506,7 +503,7 @@ public class TiffReader extends BinaryFi
if (offset + length > byteSource.getLength()) {
length = (int) (byteSource.getLength() - offset);
}
- final byte data[] = byteSource.getBlock(offset, length);
+ final byte[] data = byteSource.getBlock(offset, length);
// check if the last read byte is actually the end of the image data
if (strict &&
(length < 2 ||