Author: damjan
Date: Fri Nov 22 19:27:57 2013
New Revision: 1544656
URL: http://svn.apache.org/r1544656
Log:
Use autoboxing.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java?rev=1544656&r1=1544655&r2=1544656&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
Fri Nov 22 19:27:57 2013
@@ -738,12 +738,12 @@ public class T4AndT6Compression {
final T4_T6_Tables.Entry entry = lowerBound(
T4_T6_Tables.additionalMakeUpCodes, runLength);
entry.writeBits(bitStream);
- runLength -= entry.value.intValue();
+ runLength -= entry.value;
}
while (runLength >= 64) {
final T4_T6_Tables.Entry entry = lowerBound(makeUpCodes,
runLength);
entry.writeBits(bitStream);
- runLength -= entry.value.intValue();
+ runLength -= entry.value;
}
final T4_T6_Tables.Entry terminatingEntry =
terminatingCodes[runLength];
terminatingEntry.writeBits(bitStream);
@@ -755,11 +755,10 @@ public class T4AndT6Compression {
int last = entries.length - 1;
do {
final int middle = (first + last) >>> 1;
- if (entries[middle].value.intValue() <= value
- && ((middle + 1) >= entries.length || value <
entries[middle + 1].value
- .intValue())) {
+ if (entries[middle].value <= value
+ && ((middle + 1) >= entries.length || value <
entries[middle + 1].value)) {
return entries[middle];
- } else if (entries[middle].value.intValue() > value) {
+ } else if (entries[middle].value > value) {
last = middle - 1;
} else {
first = middle + 1;
@@ -779,8 +778,8 @@ public class T4AndT6Compression {
} else {
runLength = (Integer) blackRunLengths.decode(bitStream);
}
- totalLength += runLength.intValue();
- } while (runLength.intValue() > 63);
+ totalLength += runLength;
+ } while (runLength > 63);
return totalLength;
} catch (final HuffmanTreeException huffmanException) {
throw new ImageReadException("Decompression error",
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=1544656&r1=1544655&r2=1544656&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
Fri Nov 22 19:27:57 2013
@@ -247,7 +247,7 @@ public class TiffImageMetadata extends I
throws ImageReadException {
// Please keep this method in sync with TiffField's getTag()
final Integer tagCount = tagCounts.get(tagInfo.tag);
- final int tagsMatching = tagCount == null ? 0 : tagCount.intValue();
+ final int tagsMatching = tagCount == null ? 0 : tagCount;
final List<? extends IImageMetadataItem> directories =
getDirectories();
if (exactDirectoryMatch
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=1544656&r1=1544655&r2=1544656&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
Fri Nov 22 19:27:57 2013
@@ -564,12 +564,7 @@ public class TiffImageParser extends Ima
+ sb.toString());
}
- final int x0 = ix0.intValue();
- final int y0 = iy0.intValue();
- final int width = iwidth.intValue();
- final int height = iheight.intValue();
-
- return new Rectangle(x0, y0, width, height);
+ return new Rectangle(ix0, iy0, iwidth, iheight);
}
protected BufferedImage getBufferedImage(final TiffDirectory directory,
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=1544656&r1=1544655&r2=1544656&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
Fri Nov 22 19:27:57 2013
@@ -40,7 +40,7 @@ public class FieldTypeLong extends Field
@Override
public byte[] writeData(final Object o, final ByteOrder byteOrder) throws
ImageWriteException {
if (o instanceof Integer) {
- return ByteConversions.toBytes(((Integer)o).intValue(), byteOrder);
+ return ByteConversions.toBytes((Integer)o, byteOrder);
} else if (o instanceof int[]) {
final int numbers[] = (int[]) o;
return ByteConversions.toBytes(numbers, byteOrder);
@@ -48,7 +48,7 @@ public class FieldTypeLong extends Field
final Integer numbers[] = (Integer[]) o;
final int values[] = new int[numbers.length];
for (int i = 0; i < values.length; i++) {
- values[i] = numbers[i].intValue();
+ values[i] = numbers[i];
}
return ByteConversions.toBytes(values, byteOrder);
} else {
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=1544656&r1=1544655&r2=1544656&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
Fri Nov 22 19:27:57 2013
@@ -168,7 +168,7 @@ public abstract class TiffImageWriterBas
TiffOutputDirectory previousDirectory = null;
for (int i = 0; i < directoryIndices.size(); i++) {
final Integer index = directoryIndices.get(i);
- if (index.intValue() != i) {
+ if (index != i) {
throw new ImageWriteException("Missing directory: " + i + ".");
}
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=1544656&r1=1544655&r2=1544656&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
Fri Nov 22 19:27:57 2013
@@ -363,7 +363,7 @@ public class XpmImageParser extends Imag
} else {
loadColorNames();
if (colorNames.containsKey(color)) {
- return (colorNames.get(color)).intValue();
+ return colorNames.get(color);
}
return 0x00000000;
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1544656&r1=1544655&r2=1544656&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
Fri Nov 22 19:27:57 2013
@@ -121,15 +121,15 @@ public class TiffLzwTest extends TiffBas
}
}
final Integer expectedCode = codes.get(index++);
- if (code != expectedCode.intValue()) {
+ if (code != expectedCode) {
Debug.debug("bad code: " + index + "/" + codes.size());
Debug.debug("code: " + code + " (0x"
+ Integer.toHexString(code) + ") "
+ Integer.toBinaryString(code));
Debug.debug("expected: " + expectedCode + " (0x"
- + Integer.toHexString(expectedCode.intValue())
+ + Integer.toHexString(expectedCode)
+ ") "
- + Integer.toBinaryString(expectedCode.intValue()));
+ + Integer.toBinaryString(expectedCode));
Debug.debug("clearCode: " + clearCode + " (0x"
+ Integer.toHexString(clearCode) + ") "
+ Integer.toBinaryString(clearCode));
@@ -210,15 +210,15 @@ public class TiffLzwTest extends TiffBas
Debug.debug();
}
final Integer expectedCode = codes.get(index++);
- if (code != expectedCode.intValue()) {
+ if (code != expectedCode) {
Debug.debug("bad code: " + index + "/" + codes.size());
Debug.debug("code: " + code + " (0x"
+ Integer.toHexString(code) + ") "
+ Integer.toBinaryString(code));
Debug.debug("expected: " + expectedCode + " (0x"
- + Integer.toHexString(expectedCode.intValue())
+ + Integer.toHexString(expectedCode)
+ ") "
- + Integer.toBinaryString(expectedCode.intValue()));
+ + Integer.toBinaryString(expectedCode));
Debug.debug("clearCode: " + clearCode + " (0x"
+ Integer.toHexString(clearCode) + ") "
+ Integer.toBinaryString(clearCode));
