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 [4/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/tiff/datareaders/DataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java Tue Nov 26 21:08:17 2013
@@ -37,15 +37,15 @@ import org.apache.commons.imaging.format
public abstract class DataReader implements TiffConstants {
protected final TiffDirectory directory;
protected final PhotometricInterpreter photometricInterpreter;
- protected final int bitsPerSample[];
- protected final int last[];
+ protected final int[] bitsPerSample;
+ protected final int[] last;
protected final int predictor;
protected final int samplesPerPixel;
protected final int width, height;
public DataReader(final TiffDirectory directory,
- final PhotometricInterpreter photometricInterpreter, final int bitsPerSample[],
+ final PhotometricInterpreter photometricInterpreter, final int[] bitsPerSample,
final int predictor, final int samplesPerPixel, final int width, final int height) {
this.directory = directory;
this.photometricInterpreter = photometricInterpreter;
@@ -101,7 +101,7 @@ public abstract class DataReader impleme
}
}
- protected int[] applyPredictor(final int samples[]) {
+ protected int[] applyPredictor(final int[] samples) {
if (predictor == 2) {
// Horizontal differencing.
for (int i = 0; i < samples.length; i++) {
@@ -113,7 +113,7 @@ public abstract class DataReader impleme
return samples;
}
- protected byte[] decompress(final byte compressed[], final int compression,
+ protected byte[] decompress(final byte[] compressed, final int compression,
final int expected_size, final int tileWidth, final int tileHeight)
throws ImageReadException, IOException {
final TiffField fillOrderField = directory
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java Tue Nov 26 21:08:17 2013
@@ -40,7 +40,7 @@ public final class DataReaderStrips exte
public DataReaderStrips(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter, final int bitsPerPixel,
- final int bitsPerSample[], final int predictor, final int samplesPerPixel, final int width,
+ final int[] bitsPerSample, final int predictor, final int samplesPerPixel, final int width,
final int height, final int compression, final ByteOrder byteOrder, final int rowsPerStrip,
final TiffImageData.Strips imageData) {
super(directory, photometricInterpreter, bitsPerSample, predictor,
@@ -55,7 +55,7 @@ public final class DataReaderStrips exte
private void interpretStrip(
final ImageBuilder imageBuilder,
- final byte bytes[],
+ final byte[] bytes,
final int pixels_per_strip,
final int yLimit) throws ImageReadException, IOException {
if (y >= yLimit) {
@@ -151,7 +151,7 @@ public final class DataReaderStrips exte
}
}
} else {
- final int samples[] = new int[3];
+ final int[] samples = new int[3];
for (int i = i0; i < i1; i++) {
for (int j = 0; j < width; j++) {
samples[0] = bytes[k++] & 0xff;
@@ -210,9 +210,9 @@ public final class DataReaderStrips exte
final long bytesPerStrip = rowsInThisStrip * bytesPerRow;
final long pixelsPerStrip = rowsInThisStrip * width;
- final byte compressed[] = imageData.strips[strip].getData();
+ final byte[] compressed = imageData.strips[strip].getData();
- final byte decompressed[] = decompress(compressed, compression,
+ final byte[] decompressed = decompress(compressed, compression,
(int) bytesPerStrip, width, (int) rowsInThisStrip);
interpretStrip(
@@ -265,9 +265,9 @@ public final class DataReaderStrips exte
final long bytesPerStrip = rowsInThisStrip * bytesPerRow;
final long pixelsPerStrip = rowsInThisStrip * width;
- final byte compressed[] = imageData.strips[strip].getData();
+ final byte[] compressed = imageData.strips[strip].getData();
- final byte decompressed[] = decompress(compressed, compression,
+ final byte[] decompressed = decompress(compressed, compression,
(int) bytesPerStrip, width, (int) rowsInThisStrip);
interpretStrip(
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java Tue Nov 26 21:08:17 2013
@@ -44,7 +44,7 @@ public final class DataReaderTiled exten
public DataReaderTiled(final TiffDirectory directory,
final PhotometricInterpreter photometricInterpreter, final int tileWidth,
- final int tileLength, final int bitsPerPixel, final int bitsPerSample[],
+ final int tileLength, final int bitsPerPixel, final int[] bitsPerSample,
final int predictor, final int samplesPerPixel, final int width, final int height,
final int compression, final ByteOrder byteOrder, final TiffImageData.Tiles imageData) {
super(directory, photometricInterpreter, bitsPerSample, predictor,
@@ -60,7 +60,7 @@ public final class DataReaderTiled exten
this.byteOrder = byteOrder;
}
- private void interpretTile(final ImageBuilder imageBuilder, final byte bytes[],
+ private void interpretTile(final ImageBuilder imageBuilder, final byte[] bytes,
final int startX, final int startY, final int xLimit, final int yLimit) throws ImageReadException, IOException {
// changes introduced May 2012
// The following block of code implements changes that
@@ -104,7 +104,7 @@ public final class DataReaderTiled exten
}
}
} else {
- final int samples[] = new int[3];
+ final int[] samples = new int[3];
for (int i = i0; i < i1; i++) {
k = (i - i0) * tileWidth * 3;
for (int j = j0; j < j1; j++) {
@@ -167,9 +167,9 @@ public final class DataReaderTiled exten
int x = 0, y = 0;
for (final DataElement tile2 : imageData.tiles) {
- final byte compressed[] = tile2.getData();
+ final byte[] compressed = tile2.getData();
- final byte decompressed[] = decompress(compressed, compression,
+ final byte[] decompressed = decompress(compressed, compression,
bytesPerTile, tileWidth, tileLength);
interpretTile(imageBuilder, decompressed, x, y, width, height);
@@ -218,8 +218,8 @@ public final class DataReaderTiled exten
for (int iRow = row0; iRow <= row1; iRow++) {
for (int iCol = col0; iCol <= col1; iCol++) {
final int tile = iRow * nColumnsOfTiles+iCol;
- final byte compressed[] = imageData.tiles[tile].getData();
- final byte decompressed[] = decompress(compressed, compression,
+ final byte[] compressed = imageData.tiles[tile].getData();
+ final byte[] decompressed = decompress(compressed, compression,
bytesPerTile, tileWidth, tileLength);
x = iCol * tileWidth - x0;
y = iRow * tileLength - y0;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java Tue Nov 26 21:08:17 2013
@@ -31,7 +31,7 @@ public class FieldTypeAscii extends Fiel
public Object getValue(final TiffField entry) {
// According to EXIF specification
// "2 = ASCII An 8-bit byte containing one 7-bit ASCII code. The final byte is terminated with NULL."
- final byte bytes[] = entry.getByteArrayValue();
+ final byte[] bytes = entry.getByteArrayValue();
int nullCount = 1;
for (int i = 0; i < bytes.length - 1; i++) {
if (bytes[i] == 0) {
@@ -74,19 +74,19 @@ public class FieldTypeAscii extends Fiel
@Override
public byte[] writeData(final Object o, final ByteOrder byteOrder) throws ImageWriteException {
if (o instanceof byte[]) {
- final byte bytes[] = (byte[]) o;
- final byte result[] = new byte[bytes.length + 1];
+ final byte[] bytes = (byte[]) o;
+ final byte[] result = new byte[bytes.length + 1];
System.arraycopy(bytes, 0, result, 0, bytes.length);
result[result.length - 1] = 0;
return result;
} else if (o instanceof String) {
- byte[] bytes = null;
+ byte[] bytes;
try {
bytes = ((String) o).getBytes("UTF-8");
} catch (final UnsupportedEncodingException cannotHappen) {
throw new IllegalArgumentException("Your Java doesn't support UTF-8", cannotHappen);
}
- final byte result[] = new byte[bytes.length + 1];
+ final byte[] result = new byte[bytes.length + 1];
System.arraycopy(bytes, 0, result, 0, bytes.length);
result[result.length - 1] = 0;
return result;
@@ -94,7 +94,7 @@ public class FieldTypeAscii extends Fiel
final String[] strings = (String[]) o;
int totalLength = 0;
for (final String string : strings) {
- byte[] bytes = null;
+ byte[] bytes;
try {
bytes = string.getBytes("UTF-8");
} catch (final UnsupportedEncodingException cannotHappen) {
@@ -105,7 +105,7 @@ public class FieldTypeAscii extends Fiel
final byte[] result = new byte[totalLength];
int position = 0;
for (final String string : strings) {
- byte[] bytes = null;
+ byte[] bytes;
try {
bytes = string.getBytes("UTF-8");
} catch (final UnsupportedEncodingException cannotHappen) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java Tue Nov 26 21:08:17 2013
@@ -43,11 +43,11 @@ public class FieldTypeDouble extends Fie
return ByteConversions.toBytes(((Double) o).doubleValue(),
byteOrder);
} else if (o instanceof double[]) {
- final double numbers[] = (double[]) o;
+ final double[] numbers = (double[]) o;
return ByteConversions.toBytes(numbers, byteOrder);
} else if (o instanceof Double[]) {
- final Double numbers[] = (Double[]) o;
- final double values[] = new double[numbers.length];
+ final Double[] numbers = (Double[]) o;
+ final double[] values = new double[numbers.length];
for (int i = 0; i < values.length; i++) {
values[i] = numbers[i].doubleValue();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java Tue Nov 26 21:08:17 2013
@@ -42,11 +42,11 @@ public class FieldTypeFloat extends Fiel
if (o instanceof Float) {
return ByteConversions.toBytes(((Float) o).floatValue(), byteOrder);
} else if (o instanceof float[]) {
- final float numbers[] = (float[]) o;
+ final float[] numbers = (float[]) o;
return ByteConversions.toBytes(numbers, byteOrder);
} else if (o instanceof Float[]) {
- final Float numbers[] = (Float[]) o;
- final float values[] = new float[numbers.length];
+ final Float[] numbers = (Float[]) o;
+ final float[] values = new float[numbers.length];
for (int i = 0; i < values.length; i++) {
values[i] = numbers[i].floatValue();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java Tue Nov 26 21:08:17 2013
@@ -42,11 +42,11 @@ public class FieldTypeLong extends Field
if (o instanceof Integer) {
return ByteConversions.toBytes((Integer)o, byteOrder);
} else if (o instanceof int[]) {
- final int numbers[] = (int[]) o;
+ final int[] numbers = (int[]) o;
return ByteConversions.toBytes(numbers, byteOrder);
} else if (o instanceof Integer[]) {
- final Integer numbers[] = (Integer[]) o;
- final int values[] = new int[numbers.length];
+ final Integer[] numbers = (Integer[]) o;
+ final int[] values = new int[numbers.length];
for (int i = 0; i < values.length; i++) {
values[i] = numbers[i];
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.java Tue Nov 26 21:08:17 2013
@@ -43,23 +43,22 @@ public class FieldTypeRational extends F
if (o instanceof RationalNumber) {
return ByteConversions.toBytes((RationalNumber) o, byteOrder);
} else if (o instanceof RationalNumber[]) {
- return ByteConversions.toBytes((RationalNumber[]) o,
- byteOrder);
+ return ByteConversions.toBytes((RationalNumber[]) o, byteOrder);
} else if (o instanceof Number) {
final Number number = (Number) o;
final RationalNumber rationalNumber = RationalNumber.valueOf(number.doubleValue());
return ByteConversions.toBytes(rationalNumber, byteOrder);
} else if (o instanceof Number[]) {
- final Number numbers[] = (Number[]) o;
- final RationalNumber rationalNumbers[] = new RationalNumber[numbers.length];
+ final Number[] numbers = (Number[]) o;
+ final RationalNumber[] rationalNumbers = new RationalNumber[numbers.length];
for (int i = 0; i < numbers.length; i++) {
final Number number = numbers[i];
rationalNumbers[i] = RationalNumber.valueOf(number.doubleValue());
}
return ByteConversions.toBytes(rationalNumbers, byteOrder);
} else if (o instanceof double[]) {
- final double numbers[] = (double[]) o;
- final RationalNumber rationalNumbers[] = new RationalNumber[numbers.length];
+ final double[] numbers = (double[]) o;
+ final RationalNumber[] rationalNumbers = new RationalNumber[numbers.length];
for (int i = 0; i < numbers.length; i++) {
final double number = numbers[i];
rationalNumbers[i] = RationalNumber.valueOf(number);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java Tue Nov 26 21:08:17 2013
@@ -31,24 +31,21 @@ public class FieldTypeShort extends Fiel
public Object getValue(final TiffField entry) {
final byte[] bytes = entry.getByteArrayValue();
if (entry.getCount() == 1) {
- return ByteConversions.toShort(bytes,
- entry.getByteOrder());
+ return ByteConversions.toShort(bytes, entry.getByteOrder());
}
- return ByteConversions.toShorts(bytes,
- entry.getByteOrder());
+ return ByteConversions.toShorts(bytes, entry.getByteOrder());
}
@Override
public byte[] writeData(final Object o, final ByteOrder byteOrder) throws ImageWriteException {
if (o instanceof Short) {
- return ByteConversions.toBytes(
- ((Short)o).shortValue(), byteOrder);
+ return ByteConversions.toBytes(((Short)o).shortValue(), byteOrder);
} else if (o instanceof short[]) {
- final short numbers[] = (short[]) o;
+ final short[] numbers = (short[]) o;
return ByteConversions.toBytes(numbers, byteOrder);
} else if (o instanceof Short[]) {
- final Short numbers[] = (Short[]) o;
- final short values[] = new short[numbers.length];
+ final Short[] numbers = (Short[]) o;
+ final short[] values = new short[numbers.length];
for (int i = 0; i < values.length; i++) {
values[i] = numbers[i].shortValue();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java Tue Nov 26 21:08:17 2013
@@ -23,20 +23,20 @@ import org.apache.commons.imaging.common
public abstract class PhotometricInterpreter {
protected final int samplesPerPixel;
- protected final int bitsPerSample[];
+ protected final int[] bitsPerSample;
protected final int predictor;
protected final int width;
protected final int height;
- public PhotometricInterpreter(final int fSamplesPerPixel, final int fBitsPerSample[],
- final int Predictor, final int width, final int height) {
- this.samplesPerPixel = fSamplesPerPixel;
- this.bitsPerSample = fBitsPerSample;
- this.predictor = Predictor;
+ public PhotometricInterpreter(final int samplesPerPixel, final int[] bitsPerSample,
+ final int predictor, final int width, final int height) {
+ this.samplesPerPixel = samplesPerPixel;
+ this.bitsPerSample = bitsPerSample;
+ this.predictor = predictor;
this.width = width;
this.height = height;
}
public abstract void interpretPixel(ImageBuilder imageBuilder,
- int samples[], int x, int y) throws ImageReadException, IOException;
+ int[] samples, int x, int y) throws ImageReadException, IOException;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java Tue Nov 26 21:08:17 2013
@@ -26,17 +26,17 @@ public class PhotometricInterpreterBiLev
// private final int bitsPerPixel;
- public PhotometricInterpreterBiLevel(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int predictor, final int width,
+ public PhotometricInterpreterBiLevel(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width,
final int height, final boolean invert) {
- super(fSamplesPerPixel, fBitsPerSample, predictor, width, height);
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
this.invert = invert;
// this.bitsPerPixel = fBitsPerPixel;
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
int sample = samples[0];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java Tue Nov 26 21:08:17 2013
@@ -23,13 +23,13 @@ import org.apache.commons.imaging.color.
import org.apache.commons.imaging.common.ImageBuilder;
public class PhotometricInterpreterCieLab extends PhotometricInterpreter {
- public PhotometricInterpreterCieLab(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int Predictor, final int width, final int height) {
- super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
+ public PhotometricInterpreterCieLab(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width, final int height) {
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
final int cieL = samples[0];
final int cieA = (byte) samples[1];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java Tue Nov 26 21:08:17 2013
@@ -23,13 +23,13 @@ import org.apache.commons.imaging.color.
import org.apache.commons.imaging.common.ImageBuilder;
public class PhotometricInterpreterCmyk extends PhotometricInterpreter {
- public PhotometricInterpreterCmyk(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int Predictor, final int width, final int height) {
- super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
+ public PhotometricInterpreterCmyk(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width, final int height) {
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
final int sc = samples[0];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java Tue Nov 26 21:08:17 2013
@@ -24,9 +24,9 @@ import org.apache.commons.imaging.common
public class PhotometricInterpreterLogLuv extends PhotometricInterpreter {
// private final boolean yOnly;
- public PhotometricInterpreterLogLuv(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int predictor, final int width, final int height) {
- super(fSamplesPerPixel, fBitsPerSample, predictor, width, height);
+ public PhotometricInterpreterLogLuv(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width, final int height) {
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
// this.yOnly = yonly;
}
@@ -38,7 +38,7 @@ public class PhotometricInterpreterLogLu
// private float function_f(float value, )
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
float X, Y, Z;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java Tue Nov 26 21:08:17 2013
@@ -29,18 +29,18 @@ public class PhotometricInterpreterPalet
*/
private final int[] indexColorMap;
- public PhotometricInterpreterPalette(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int Predictor, final int width, final int height,
- final int[] fColorMap) {
- super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
+ public PhotometricInterpreterPalette(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width, final int height,
+ final int[] colorMap) {
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
- final int fBitsPerPixel = bitsPerSample[0];
- final int colormap_scale = (1 << fBitsPerPixel);
- indexColorMap = new int[colormap_scale];
- for (int index = 0; index < colormap_scale; index++) {
- final int red = (fColorMap[index] >> 8) & 0xff;
- final int green = (fColorMap[index + (colormap_scale)] >> 8) & 0xff;
- final int blue = (fColorMap[index + (2 * colormap_scale)] >> 8) & 0xff;
+ final int bitsPerPixel = this.bitsPerSample[0];
+ final int colormapScale = (1 << bitsPerPixel);
+ indexColorMap = new int[colormapScale];
+ for (int index = 0; index < colormapScale; index++) {
+ final int red = (colorMap[index] >> 8) & 0xff;
+ final int green = (colorMap[index + (colormapScale)] >> 8) & 0xff;
+ final int blue = (colorMap[index + (2 * colormapScale)] >> 8) & 0xff;
indexColorMap[index] = 0xff000000 | (red << 16) | (green << 8)
| blue;
}
@@ -48,7 +48,7 @@ public class PhotometricInterpreterPalet
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
imageBuilder.setRGB(x, y, indexColorMap[samples[0]]);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java Tue Nov 26 21:08:17 2013
@@ -22,13 +22,13 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.common.ImageBuilder;
public class PhotometricInterpreterRgb extends PhotometricInterpreter {
- public PhotometricInterpreterRgb(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int Predictor, final int width, final int height) {
- super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
+ public PhotometricInterpreterRgb(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor, final int width, final int height) {
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
final int red = samples[0];
final int green = samples[1];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java Tue Nov 26 21:08:17 2013
@@ -23,10 +23,10 @@ import org.apache.commons.imaging.common
public class PhotometricInterpreterYCbCr extends PhotometricInterpreter {
- public PhotometricInterpreterYCbCr(final int fSamplesPerPixel,
- final int fBitsPerSample[], final int predictor,
+ public PhotometricInterpreterYCbCr(final int samplesPerPixel,
+ final int[] bitsPerSample, final int predictor,
final int width, final int height) {
- super(fSamplesPerPixel, fBitsPerSample, predictor, width, height);
+ super(samplesPerPixel, bitsPerSample, predictor, width, height);
}
public static int limit(final int value, final int min, final int max) {
@@ -65,7 +65,7 @@ public class PhotometricInterpreterYCbCr
}
@Override
- public void interpretPixel(final ImageBuilder imageBuilder, final int samples[], final int x,
+ public void interpretPixel(final ImageBuilder imageBuilder, final int[] samples, final int x,
final int y) throws ImageReadException, IOException {
final int Y = samples[0];
final int Cb = samples[1];
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java Tue Nov 26 21:08:17 2013
@@ -50,7 +50,7 @@ public final class TagInfoGpsText extend
new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
// Try to interpret an undefined text as ISO-8859-1 (Latin)
"ISO-8859-1"); // Undefined
- private static final TagInfoGpsText.TextEncoding TEXT_ENCODINGS[] = {
+ private static final TagInfoGpsText.TextEncoding[] TEXT_ENCODINGS = {
TEXT_ENCODING_ASCII, //
TEXT_ENCODING_JIS, //
TEXT_ENCODING_UNICODE_LE, //
@@ -69,7 +69,7 @@ public final class TagInfoGpsText extend
}
private static final class TextEncoding {
- public final byte prefix[];
+ public final byte[] prefix;
public final String encodingName;
public TextEncoding(final byte[] prefix, final String encodingName) {
@@ -88,11 +88,11 @@ public final class TagInfoGpsText extend
try {
// try ASCII, with NO prefix.
- final byte asciiBytes[] = s.getBytes(TEXT_ENCODING_ASCII.encodingName);
+ final byte[] asciiBytes = s.getBytes(TEXT_ENCODING_ASCII.encodingName);
final String decodedAscii = new String(asciiBytes, TEXT_ENCODING_ASCII.encodingName);
if (decodedAscii.equals(s)) {
// no unicode/non-ascii values.
- final byte result[] = new byte[asciiBytes.length
+ final byte[] result = new byte[asciiBytes.length
+ TEXT_ENCODING_ASCII.prefix.length];
System.arraycopy(TEXT_ENCODING_ASCII.prefix, 0, result, 0,
TEXT_ENCODING_ASCII.prefix.length);
@@ -107,13 +107,11 @@ public final class TagInfoGpsText extend
} else {
encoding = TEXT_ENCODING_UNICODE_LE;
}
- final byte unicodeBytes[] = s.getBytes(encoding.encodingName);
- final byte result[] = new byte[unicodeBytes.length +
+ final byte[] unicodeBytes = s.getBytes(encoding.encodingName);
+ final byte[] result = new byte[unicodeBytes.length +
encoding.prefix.length];
- System.arraycopy(encoding.prefix, 0,
- result, 0, encoding.prefix.length);
- System.arraycopy(unicodeBytes, 0,
- result, encoding.prefix.length, unicodeBytes.length);
+ System.arraycopy(encoding.prefix, 0, result, 0, encoding.prefix.length);
+ System.arraycopy(unicodeBytes, 0, result, encoding.prefix.length, unicodeBytes.length);
return result;
} catch (final UnsupportedEncodingException e) {
throw new ImageWriteException(e.getMessage(), e);
@@ -148,7 +146,7 @@ public final class TagInfoGpsText extend
throw new ImageReadException("GPS text field not encoded as bytes.");
}
- final byte bytes[] = entry.getByteArrayValue();
+ final byte[] bytes = entry.getByteArrayValue();
if (bytes.length < 8) {
try {
// try ASCII, with NO prefix.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java Tue Nov 26 21:08:17 2013
@@ -19,11 +19,11 @@ package org.apache.commons.imaging.forma
import org.apache.commons.imaging.formats.tiff.TiffElement;
class ImageDataOffsets {
- final int imageDataOffsets[];
+ final int[] imageDataOffsets;
final TiffOutputField imageDataOffsetsField;
- final TiffOutputItem outputItems[];
+ final TiffOutputItem[] outputItems;
- ImageDataOffsets(final TiffElement.DataElement imageData[],
+ ImageDataOffsets(final TiffElement.DataElement[] imageData,
final int[] imageDataOffsets,
final TiffOutputField imageDataOffsetsField) {
this.imageDataOffsets = imageDataOffsets;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Tue Nov 26 21:08:17 2013
@@ -308,8 +308,7 @@ public abstract class TiffImageWriterBas
int rowsPerStrip = 64000 / (width * bitsPerSample * samplesPerPixel); // TODO:
rowsPerStrip = Math.max(1, rowsPerStrip); // must have at least one.
- final byte strips[][] = getStrips(src, samplesPerPixel, bitsPerSample,
- rowsPerStrip);
+ final byte[][] strips = getStrips(src, samplesPerPixel, bitsPerSample, rowsPerStrip);
// System.out.println("width: " + width);
// System.out.println("height: " + height);
@@ -369,13 +368,13 @@ public abstract class TiffImageWriterBas
}
} else if (compression == TIFF_COMPRESSION_LZW) {
for (int i = 0; i < strips.length; i++) {
- final byte uncompressed[] = strips[i];
+ final byte[] uncompressed = strips[i];
final int LZW_MINIMUM_CODE_SIZE = 8;
final MyLzwCompressor compressor = new MyLzwCompressor(
LZW_MINIMUM_CODE_SIZE, ByteOrder.BIG_ENDIAN, true);
- final byte compressed[] = compressor.compress(uncompressed);
+ final byte[] compressed = compressor.compress(uncompressed);
strips[i] = compressed;
}
@@ -386,10 +385,9 @@ public abstract class TiffImageWriterBas
"Invalid compression parameter (Only CCITT 1D/Group 3/Group 4, LZW, Packbits and uncompressed supported).");
}
- final TiffElement.DataElement imageData[] = new TiffElement.DataElement[strips.length];
+ final TiffElement.DataElement[] imageData = new TiffElement.DataElement[strips.length];
for (int i = 0; i < strips.length; i++) {
- imageData[i] = new TiffImageData.Data(0, strips[i].length,
- strips[i]);
+ imageData[i] = new TiffImageData.Data(0, strips[i].length, strips[i]);
}
final TiffOutputSet outputSet = new TiffOutputSet(byteOrder);
@@ -461,7 +459,7 @@ public abstract class TiffImageWriterBas
}
if (null != xmpXml) {
- final byte xmpXmlBytes[] = xmpXml.getBytes("utf-8");
+ final byte[] xmpXmlBytes = xmpXml.getBytes("utf-8");
directory.add(TiffTagConstants.TIFF_TAG_XMP, xmpXmlBytes);
}
@@ -507,7 +505,7 @@ public abstract class TiffImageWriterBas
final int stripCount = (height + rowsPerStrip - 1) / rowsPerStrip;
- byte result[][] = null;
+ byte[][] result;
{ // Write Strips
result = new byte[stripCount][];
@@ -521,7 +519,7 @@ public abstract class TiffImageWriterBas
final int bytesPerRow = (bitsInRow + 7) / 8;
final int bytesInStrip = rowsInStrip * bytesPerRow;
- final byte uncompressed[] = new byte[bytesInStrip];
+ final byte[] uncompressed = new byte[bytesInStrip];
int counter = 0;
int y = i * rowsPerStrip;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java Tue Nov 26 21:08:17 2013
@@ -42,7 +42,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.TiffReader;
public class TiffImageWriterLossless extends TiffImageWriterBase {
- private final byte exifBytes[];
+ private final byte[] exifBytes;
private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR = new Comparator<TiffElement>() {
public int compare(final TiffElement e1, final TiffElement e2) {
return e1.length - e2.length;
@@ -54,11 +54,11 @@ public class TiffImageWriterLossless ext
}
};
- public TiffImageWriterLossless(final byte exifBytes[]) {
+ public TiffImageWriterLossless(final byte[] exifBytes) {
this.exifBytes = exifBytes;
}
- public TiffImageWriterLossless(final ByteOrder byteOrder, final byte exifBytes[]) {
+ public TiffImageWriterLossless(final ByteOrder byteOrder, final byte[] exifBytes) {
super(byteOrder);
this.exifBytes = exifBytes;
}
@@ -101,7 +101,7 @@ public class TiffImageWriterLossless ext
final TiffImageData tiffImageData = directory.getTiffImageData();
if (tiffImageData != null) {
- final DataElement data[] = tiffImageData.getImageData();
+ final DataElement[] data = tiffImageData.getImageData();
Collections.addAll(elements, data);
}
}
@@ -268,7 +268,7 @@ public class TiffImageWriterLossless ext
}
private static class BufferOutputStream extends OutputStream {
- private final byte buffer[];
+ private final byte[] buffer;
private int index;
public BufferOutputStream(final byte[] buffer, final int index) {
@@ -286,7 +286,7 @@ public class TiffImageWriterLossless ext
}
@Override
- public void write(final byte b[], final int off, final int len) throws IOException {
+ public void write(final byte[] b, final int off, final int len) throws IOException {
if (index + len > buffer.length) {
throw new IOException("Buffer overflow.");
}
@@ -300,7 +300,7 @@ public class TiffImageWriterLossless ext
final long outputLength) throws IOException, ImageWriteException {
final TiffOutputDirectory rootDirectory = outputSet.getRootDirectory();
- final byte output[] = new byte[(int)outputLength];
+ final byte[] output = new byte[(int)outputLength];
// copy old data (including maker notes, etc.)
System.arraycopy(exifBytes, 0, output, 0,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java Tue Nov 26 21:08:17 2013
@@ -536,7 +536,7 @@ public final class TiffOutputDirectory e
FieldType.LONG, 1, new byte[TIFF_ENTRY_MAX_VALUE_LENGTH]);
add(jpegOffsetField);
- final byte lengthValue[] = FieldType.LONG.writeData(
+ final byte[] lengthValue = FieldType.LONG.writeData(
jpegImageData.length,
outputSummary.byteOrder);
@@ -571,14 +571,12 @@ public final class TiffOutputDirectory e
// --------
- final TiffElement.DataElement imageData[] = tiffImageData.getImageData();
+ final TiffElement.DataElement[] imageData = tiffImageData.getImageData();
- int imageDataOffsets[] = null;
- int imageDataByteCounts[] = null;
// TiffOutputField imageDataOffsetsField = null;
- imageDataOffsets = new int[imageData.length];
- imageDataByteCounts = new int[imageData.length];
+ int[] imageDataOffsets = new int[imageData.length];
+ int[] imageDataByteCounts = new int[imageData.length];
for (int i = 0; i < imageData.length; i++) {
imageDataByteCounts[i] = imageData[i].length;
}
@@ -594,8 +592,7 @@ public final class TiffOutputDirectory e
// --------
- final byte data[] = FieldType.LONG.writeData(imageDataByteCounts,
- outputSummary.byteOrder);
+ final byte[] data = FieldType.LONG.writeData(imageDataByteCounts, outputSummary.byteOrder);
final TiffOutputField byteCountsField = new TiffOutputField(
byteCountsTag, FieldType.LONG, imageDataByteCounts.length,
data);
@@ -603,8 +600,7 @@ public final class TiffOutputDirectory e
// --------
- imageDataInfo = new ImageDataOffsets(imageData, imageDataOffsets,
- imageDataOffsetField);
+ imageDataInfo = new ImageDataOffsets(imageData, imageDataOffsets, imageDataOffsetField);
}
// --------------------------------------------------------------
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java Tue Nov 26 21:08:17 2013
@@ -31,18 +31,18 @@ public class TiffOutputField implements
public final TagInfo tagInfo;
public final FieldType fieldType;
public final int count;
- private byte bytes[];
+ private byte[] bytes;
private final TiffOutputItem.Value separateValueItem;
private int sortHint = -1;
private static final String NEWLINE = System.getProperty("line.separator");
public TiffOutputField(final TagInfo tagInfo, final FieldType tagtype, final int count,
- final byte bytes[]) {
+ final byte[] bytes) {
this(tagInfo.tag, tagInfo, tagtype, count, bytes);
}
public TiffOutputField(final int tag, final TagInfo tagInfo, final FieldType fieldType,
- final int count, final byte bytes[]) {
+ final int count, final byte[] bytes) {
this.tag = tag;
this.tagInfo = tagInfo;
this.fieldType = fieldType;
@@ -105,7 +105,7 @@ public class TiffOutputField implements
return Arrays.equals(bytes, data);
}
- protected void setData(final byte bytes[]) throws ImageWriteException {
+ protected void setData(final byte[] bytes) throws ImageWriteException {
// if(tagInfo.isUnknown())
// Debug.debug("unknown tag(0x" + Integer.toHexString(tag)
// + ") setData", bytes);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java Tue Nov 26 21:08:17 2013
@@ -43,7 +43,7 @@ abstract class TiffOutputItem implements
ImageWriteException;
public static class Value extends TiffOutputItem {
- private final byte bytes[];
+ private final byte[] bytes;
private final String name;
public Value(final String name, final byte[] bytes) {
@@ -61,7 +61,7 @@ abstract class TiffOutputItem implements
return name;
}
- public void updateValue(final byte bytes[]) throws ImageWriteException {
+ public void updateValue(final byte[] bytes) throws ImageWriteException {
if (this.bytes.length != bytes.length) {
throw new ImageWriteException("Updated data size mismatch: "
+ this.bytes.length + " vs. " + bytes.length);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java Tue Nov 26 21:08:17 2013
@@ -59,7 +59,7 @@ class TiffOutputSummary implements TiffC
public void updateOffsets(final ByteOrder byteOrder) throws ImageWriteException {
for (OffsetItem offset : offsetItems) {
- final byte value[] = FieldType.LONG.writeData(
+ final byte[] value = FieldType.LONG.writeData(
(int) offset.item.getOffset(), byteOrder);
offset.itemOffsetField.setData(value);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Tue Nov 26 21:08:17 2013
@@ -44,7 +44,7 @@ import org.apache.commons.imaging.util.I
public class WbmpImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".wbmp";
- private static final String ACCEPTED_EXTENSIONS[] = { ".wbmp", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".wbmp", };
@Override
public String getName() {
@@ -68,7 +68,7 @@ public class WbmpImageParser extends Ima
}
@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/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Tue Nov 26 21:08:17 2013
@@ -50,7 +50,7 @@ import org.apache.commons.imaging.util.I
public class XbmImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".xbm";
- private static final String ACCEPTED_EXTENSIONS[] = { ".xbm", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".xbm", };
@Override
public String getName() {
@@ -74,7 +74,7 @@ public class XbmImageParser 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/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Tue Nov 26 21:08:17 2013
@@ -55,9 +55,9 @@ import org.apache.commons.imaging.util.I
public class XpmImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".xpm";
- private static final String ACCEPTED_EXTENSIONS[] = { ".xpm", };
+ private static final String[] ACCEPTED_EXTENSIONS = { ".xpm", };
private static Map<String, Integer> colorNames = null;
- private static final char WRITE_PALETTE[] = { ' ', '.', 'X', 'o', 'O', '+',
+ private static final char[] WRITE_PALETTE = { ' ', '.', 'X', 'o', 'O', '+',
'@', '#', '$', '%', '&', '*', '=', '-', ';', ':', '>', ',', '<',
'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'q', 'w', 'e',
'r', 't', 'y', 'u', 'i', 'p', 'a', 's', 'd', 'f', 'g', 'h', 'j',
@@ -133,7 +133,7 @@ public class XpmImageParser 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;
}
@@ -647,7 +647,7 @@ public class XpmImageParser extends Imag
private String toColor(final int color) {
final String hex = Integer.toHexString(color);
if (hex.length() < 6) {
- final char zeroes[] = new char[6 - hex.length()];
+ final char[] zeroes = new char[6 - hex.length()];
Arrays.fill(zeroes, '0');
return "#" + new String(zeroes) + hex;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java Tue Nov 26 21:08:17 2013
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageR
public class IccProfileInfo {
- private final byte data[];
+ private final byte[] data;
public final int ProfileSize;
public final int CMMTypeSignature;
public final int ProfileVersion;
@@ -38,16 +38,16 @@ public class IccProfileInfo {
public final int DeviceModel;
public final int RenderingIntent;
public final int ProfileCreatorSignature;
- private final byte ProfileID[];
- private final IccTag tags[];
+ private final byte[] ProfileID;
+ private final IccTag[] tags;
- public IccProfileInfo(final byte data[], final int ProfileSize, final int CMMTypeSignature,
+ public IccProfileInfo(final byte[] data, final int ProfileSize, final int CMMTypeSignature,
final int ProfileVersion, final int ProfileDeviceClassSignature,
final int ColorSpace, final int ProfileConnectionSpace,
final int ProfileFileSignature, final int PrimaryPlatformSignature,
final int VariousFlags, final int DeviceManufacturer, final int DeviceModel,
- final int RenderingIntent, final int ProfileCreatorSignature, final byte ProfileID[],
- final IccTag tags[]) {
+ final int RenderingIntent, final int ProfileCreatorSignature, final byte[] ProfileID,
+ final IccTag[] tags) {
this.data = data;
this.ProfileSize = ProfileSize;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java Tue Nov 26 21:08:17 2013
@@ -42,7 +42,7 @@ public class IccProfileParser extends Bi
return getICCProfileInfo(new ByteSourceArray(icc_profile.getData()));
}
- public IccProfileInfo getICCProfileInfo(final byte bytes[]) {
+ public IccProfileInfo getICCProfileInfo(final byte[] bytes) {
if (bytes == null) {
return null;
}
@@ -77,7 +77,7 @@ public class IccProfileParser extends Bi
is = null;
for (final IccTag tag : result.getTags()) {
- final byte bytes[] = byteSource.getBlock(tag.offset, tag.length);
+ final byte[] bytes = byteSource.getBlock(tag.offset, tag.length);
// Debug.debug("bytes: " + bytes.length);
tag.setData(bytes);
// tag.dump("\t" + i + ": ");
@@ -213,7 +213,7 @@ public class IccProfileParser extends Bi
ProfileCreatorSignature);
}
- final byte ProfileID[] = null;
+ final byte[] ProfileID = null;
skipBytes(is, 16, "Not a Valid ICC Profile");
// readByteArray("ProfileID", 16, is,
// "Not a Valid ICC Profile");
@@ -228,7 +228,7 @@ public class IccProfileParser extends Bi
final int TagCount = read4Bytes("TagCount", is, "Not a Valid ICC Profile");
// List tags = new ArrayList();
- final IccTag tags[] = new IccTag[TagCount];
+ final IccTag[] tags = new IccTag[TagCount];
for (int i = 0; i < TagCount; i++) {
final int TagSignature = read4Bytes("TagSignature[" + i + "]", is,
@@ -268,7 +268,7 @@ public class IccProfileParser extends Bi
}
}
- final byte data[] = cis.getCache();
+ final byte[] data = cis.getCache();
if (data.length < ProfileSize) {
throw new IOException("Couldn't read ICC Profile.");
@@ -308,7 +308,7 @@ public class IccProfileParser extends Bi
return issRGB(new ByteSourceArray(icc_profile.getData()));
}
- public boolean issRGB(final byte bytes[]) throws IOException {
+ public boolean issRGB(final byte[] bytes) throws IOException {
return issRGB(new ByteSourceArray(bytes));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java Tue Nov 26 21:08:17 2013
@@ -32,11 +32,11 @@ public class IccTag {
public final int signature;
public final int offset, length;
public final IccTagType fIccTagType;
- public byte data[] = null;
- private IccTagDataType itdt = null;
+ public byte[] data;
+ private IccTagDataType itdt;
private int data_type_signature;
- // public final byte data[];
+ // public final byte[] data;
public IccTag(final int signature, final int offset, final int length, final IccTagType fIccTagType) {
this.signature = signature;
@@ -45,7 +45,7 @@ public class IccTag {
this.fIccTagType = fIccTagType;
}
- public void setData(final byte bytes[]) throws IOException {
+ public void setData(final byte[] bytes) throws IOException {
data = bytes;
BinaryInputStream bis = null;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java Tue Nov 26 21:08:17 2013
@@ -21,10 +21,10 @@ import java.io.IOException;
import org.apache.commons.imaging.ImageReadException;
interface IccTagDataType {
+
String getName();
int getSignature();
- void dump(String prefix, byte bytes[]) throws ImageReadException,
- IOException;
+ void dump(String prefix, byte[] bytes) throws ImageReadException, IOException;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java Tue Nov 26 21:08:17 2013
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.util.I
public enum IccTagDataTypes implements IccTagDataType {
DESC_TYPE(
"descType", 0x64657363) {
- public void dump(final String prefix, final byte bytes[])
+ public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
BinaryInputStream bis = null;
@@ -56,7 +56,7 @@ public enum IccTagDataTypes implements I
DATA_TYPE(
"dataType", 0x64617461) {
- public void dump(final String prefix, final byte bytes[])
+ public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
BinaryInputStream bis = null;
@@ -76,7 +76,7 @@ public enum IccTagDataTypes implements I
MULTI_LOCALIZED_UNICODE_TYPE(
"multiLocalizedUnicodeType", (0x6D6C7563)) {
- public void dump(final String prefix, final byte bytes[])
+ public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
BinaryInputStream bis = null;
@@ -96,7 +96,7 @@ public enum IccTagDataTypes implements I
SIGNATURE_TYPE(
"signatureType", ((0x73696720))) {
- public void dump(final String prefix, final byte bytes[])
+ public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
BinaryInputStream bis = null;
@@ -129,7 +129,7 @@ public enum IccTagDataTypes implements I
TEXT_TYPE(
"textType", 0x74657874) {
- public void dump(final String prefix, final byte bytes[])
+ public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
BinaryInputStream bis = null;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java Tue Nov 26 21:08:17 2013
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.icc;
interface IccTagType {
+
String getName();
String getTypeDescription();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java Tue Nov 26 21:08:17 2013
@@ -20,7 +20,8 @@ import java.io.Serializable;
import java.util.Comparator;
class ColorSpaceSubset {
- final int mins[], maxs[];
+ final int[] mins;
+ final int[] maxs;
final int precision;
final int precision_mask;
final int total;
@@ -44,7 +45,7 @@ class ColorSpaceSubset {
rgb = -1;
}
- ColorSpaceSubset(final int total, final int precision, final int mins[], final int maxs[]) {
+ ColorSpaceSubset(final int total, final int precision, final int[] mins, final int[] maxs) {
this.total = total;
this.precision = precision;
this.mins = mins;
@@ -130,7 +131,7 @@ class ColorSpaceSubset {
}
- public void setAverageRGB(final int table[]) {
+ public void setAverageRGB(final int[] table) {
long redsum = 0, greensum = 0, bluesum = 0;
for (int red = mins[0]; red <= maxs[0]; red++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java Tue Nov 26 21:08:17 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.palet
class MedianCutPalette extends SimplePalette {
private final ColorGroup root;
- public MedianCutPalette(final ColorGroup root, final int palette[]) {
+ public MedianCutPalette(final ColorGroup root, final int[] palette) {
super(palette);
this.root = root;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java Tue Nov 26 21:08:17 2013
@@ -39,7 +39,7 @@ public class MedianCutQuantizer {
final int width = image.getWidth();
final int height = image.getHeight();
- final int row[] = new int[width];
+ final int[] row = new int[width];
for (int y = 0; y < height; y++) {
image.getRGB(0, y, width, 1, row, 0, width);
for (int x = 0; x < width; x++) {
@@ -94,7 +94,7 @@ public class MedianCutQuantizer {
Debug.debug("lossless palette: " + discrete_colors);
}
- final int palette[] = new int[discrete_colors];
+ final int[] palette = new int[discrete_colors];
final List<ColorCount> color_counts = new ArrayList<ColorCount>(
color_map.values());
@@ -129,7 +129,7 @@ public class MedianCutQuantizer {
Debug.debug("palette size: " + palette_size);
}
- final int palette[] = new int[palette_size];
+ final int[] palette = new int[palette_size];
for (int i = 0; i < color_groups.size(); i++) {
final ColorGroup color_group = color_groups.get(i);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java Tue Nov 26 21:08:17 2013
@@ -45,7 +45,7 @@ public class PaletteFactory {
public Palette makeExactRgbPaletteFancy(final BufferedImage src) {
// map what rgb values have been used
- final byte rgbmap[] = new byte[256 * 256 * 32];
+ final byte[] rgbmap = new byte[256 * 256 * 32];
final int width = src.getWidth();
final int height = src.getHeight();
@@ -70,7 +70,7 @@ public class PaletteFactory {
System.out.println("Used colors: " + count);
}
- final int colormap[] = new int[count];
+ final int[] colormap = new int[count];
int mapsize = 0;
for (int i = 0; i < rgbmap.length; i++) {
final int eight = 0xff & rgbmap[i];
@@ -106,7 +106,7 @@ public class PaletteFactory {
return result;
}
- private int getFrequencyTotal(final int table[], final int mins[], final int maxs[],
+ private int getFrequencyTotal(final int[] table, final int[] mins, final int[] maxs,
final int precision) {
int sum = 0;
@@ -147,9 +147,9 @@ public class PaletteFactory {
return null;
}
- final int slice_mins[] = new int[subset.mins.length];
+ final int[] slice_mins = new int[subset.mins.length];
System.arraycopy(subset.mins, 0, slice_mins, 0, subset.mins.length);
- final int slice_maxs[] = new int[subset.maxs.length];
+ final int[] slice_maxs = new int[subset.maxs.length];
System.arraycopy(subset.maxs, 0, slice_maxs, 0, subset.maxs.length);
slice_maxs[component] = slice;
@@ -174,7 +174,7 @@ public class PaletteFactory {
}
- private List<DivisionCandidate> divideSubset2(final int table[],
+ private List<DivisionCandidate> divideSubset2(final int[] table,
final ColorSpaceSubset subset, final int component, final int precision) {
if (DEBUG) {
subset.dump("trying (" + component + "): ");
@@ -182,9 +182,9 @@ public class PaletteFactory {
final int total = subset.total;
- final int slice_mins[] = new int[subset.mins.length];
+ final int[] slice_mins = new int[subset.mins.length];
System.arraycopy(subset.mins, 0, slice_mins, 0, subset.mins.length);
- final int slice_maxs[] = new int[subset.maxs.length];
+ final int[] slice_maxs = new int[subset.maxs.length];
System.arraycopy(subset.maxs, 0, slice_maxs, 0, subset.maxs.length);
int sum1 = 0, sum2;
@@ -226,7 +226,7 @@ public class PaletteFactory {
return result;
}
- private DivisionCandidate divideSubset2(final int table[],
+ private DivisionCandidate divideSubset2(final int[] table,
final ColorSpaceSubset subset, final int precision) {
final List<DivisionCandidate> dcs = new ArrayList<DivisionCandidate>();
@@ -271,7 +271,7 @@ public class PaletteFactory {
}
private List<ColorSpaceSubset> divide(final List<ColorSpaceSubset> v,
- final int desired_count, final int table[], final int precision) {
+ final int desired_count, final int[] table, final int precision) {
final List<ColorSpaceSubset> ignore = new ArrayList<ColorSpaceSubset>();
while (true) {
@@ -330,7 +330,7 @@ public class PaletteFactory {
final int table_scale = precision * COMPONENTS;
final int table_size = 1 << table_scale;
- final int table[] = new int[table_size];
+ final int[] table = new int[table_size];
final int width = src.getWidth();
final int height = src.getHeight();
@@ -423,7 +423,7 @@ public class PaletteFactory {
}
}
- final int result[] = new int[rgbs.size()];
+ final int[] result = new int[rgbs.size()];
int next = 0;
for (final int rgb : rgbs) {
result[next++] = rgb;
@@ -482,7 +482,7 @@ public class PaletteFactory {
return false;
}
- public int countTrasparentColors(final int rgbs[]) {
+ public int countTrasparentColors(final int[] rgbs) {
int first = -1;
for (final int rgb : rgbs) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java Tue Nov 26 21:08:17 2013
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.ImageW
public class QuantizedPalette extends Palette {
private final int precision;
private final List<ColorSpaceSubset> subsets;
- private final ColorSpaceSubset straight[];
+ private final ColorSpaceSubset[] straight;
public QuantizedPalette(final List<ColorSpaceSubset> subsets, final int precision) {
this.subsets = subsets;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java Tue Nov 26 21:08:17 2013
@@ -17,9 +17,9 @@
package org.apache.commons.imaging.palette;
public class SimplePalette extends Palette {
- private final int palette[];
+ private final int[] palette;
- public SimplePalette(final int palette[]) {
+ public SimplePalette(final int[] palette) {
this.palette = palette;
}
@@ -33,7 +33,7 @@ public class SimplePalette extends Palet
return palette[index];
}
- private int getPaletteIndex(final int palette[], final int argb) {
+ private int getPaletteIndex(final int[] palette, final int argb) {
for (int i = 0; i < palette.length; i++) {
if (palette[i] == argb) {
return i;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java Tue Nov 26 21:08:17 2013
@@ -46,7 +46,7 @@ public final class Debug {
}
}
- private static String getDebug(final String message, final int v[]) {
+ private static String getDebug(final String message, final int[] v) {
final StringBuilder result = new StringBuilder();
if (v == null) {
@@ -61,12 +61,12 @@ public final class Debug {
return result.toString();
}
- private static String getDebug(final String message, final byte v[]) {
+ private static String getDebug(final String message, final byte[] v) {
final int max = 250;
return getDebug(message, v, max);
}
- private static String getDebug(final String message, final byte v[], final int max) {
+ private static String getDebug(final String message, final byte[] v, final int max) {
final StringBuilder result = new StringBuilder();
@@ -96,7 +96,7 @@ public final class Debug {
return result.toString();
}
- private static String getDebug(final String message, final char v[]) {
+ private static String getDebug(final String message, final char[] v) {
final StringBuilder result = new StringBuilder();
if (v == null) {
@@ -190,11 +190,11 @@ public final class Debug {
}
}
- private static void debug(final String message, final byte v[]) {
+ private static void debug(final String message, final byte[] v) {
debug(getDebug(message, v));
}
- private static void debug(final String message, final char v[]) {
+ private static void debug(final String message, final char[] v) {
debug(getDebug(message, v));
}
@@ -221,7 +221,7 @@ public final class Debug {
}
}
- private static void debug(final String message, final int v[]) {
+ private static void debug(final String message, final int[] v) {
debug(getDebug(message, v));
}
@@ -282,7 +282,7 @@ public final class Debug {
final StringBuilder result = new StringBuilder();
if (e != null) {
- final StackTraceElement stes[] = e.getStackTrace();
+ final StackTraceElement[] stes = e.getStackTrace();
if (stes != null) {
for (int i = skip; i < stes.length && (limit < 0 || i < limit); i++) {
final StackTraceElement ste = stes[i];
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java Tue Nov 26 21:08:17 2013
@@ -43,7 +43,7 @@ public class ImageWriteExample {
params.put(ImagingConstants.PARAM_KEY_COMPRESSION, new Integer(
TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED));
- final byte bytes[] = Imaging.writeImageToBytes(image, format, params);
+ final byte[] bytes = Imaging.writeImageToBytes(image, format, params);
return bytes;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1545839&r1=1545838&r2=1545839&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Tue Nov 26 21:08:17 2013
@@ -136,7 +136,7 @@ public class BmpRoundtripTest extends Bm
// writeParams.put(PngConstants.PARAM_KEY_BMP_FORCE_TRUE_COLOR,
// Boolean.TRUE);
- final byte bytes[] = Imaging.writeImageToBytes(srcImage,
+ final byte[] bytes = Imaging.writeImageToBytes(srcImage,
ImageFormats.BMP, writeParams);
// Debug.debug("bytes", bytes);