Author: ggregory
Date: Fri Dec 23 18:59:18 2016
New Revision: 1775889
URL: http://svn.apache.org/viewvc?rev=1775889&view=rev
Log:
Add final modifier to local variables.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
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/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/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/TiffTags.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectoryTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSetTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/GrayscaleRountripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/NullParametersRoundtripTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorCieLab {
return false;
}
- ColorCieLab that = (ColorCieLab) o;
+ final ColorCieLab that = (ColorCieLab) o;
if (Double.compare(that.L, L) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorCieLch {
return false;
}
- ColorCieLch that = (ColorCieLch) o;
+ final ColorCieLch that = (ColorCieLch) o;
if (Double.compare(that.C, C) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorCieLuv {
return false;
}
- ColorCieLuv that = (ColorCieLuv) o;
+ final ColorCieLuv that = (ColorCieLuv) o;
if (Double.compare(that.L, L) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
Fri Dec 23 18:59:18 2016
@@ -122,7 +122,7 @@ public final class ColorCmy {
return false;
}
- ColorCmy colorCmy = (ColorCmy) o;
+ final ColorCmy colorCmy = (ColorCmy) o;
if (Double.compare(colorCmy.C, C) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
Fri Dec 23 18:59:18 2016
@@ -132,7 +132,7 @@ public final class ColorCmyk {
return false;
}
- ColorCmyk colorCmyk = (ColorCmyk) o;
+ final ColorCmyk colorCmyk = (ColorCmyk) o;
if (Double.compare(colorCmyk.C, C) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorHsl {
return false;
}
- ColorHsl colorHsl = (ColorHsl) o;
+ final ColorHsl colorHsl = (ColorHsl) o;
if (Double.compare(colorHsl.H, H) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorHsv {
return false;
}
- ColorHsv colorHsv = (ColorHsv) o;
+ final ColorHsv colorHsv = (ColorHsv) o;
if (Double.compare(colorHsv.H, H) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorHunterLab {
return false;
}
- ColorHunterLab that = (ColorHunterLab) o;
+ final ColorHunterLab that = (ColorHunterLab) o;
if (Double.compare(that.L, L) != 0) {
return false;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
Fri Dec 23 18:59:18 2016
@@ -92,7 +92,7 @@ public final class ColorXyz {
return false;
}
- ColorXyz colorXyz = (ColorXyz) o;
+ final ColorXyz colorXyz = (ColorXyz) o;
if (Double.compare(colorXyz.X, X) != 0) {
return false;
}
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=1775889&r1=1775888&r2=1775889&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 Dec 23 18:59:18 2016
@@ -212,7 +212,7 @@ public final class T4AndT6Compression {
for (int y = 0; y < height; y++) {
int rowLength;
try {
- T4_T6_Tables.Entry entry =
CONTROL_CODES.decode(inputStream);
+ final T4_T6_Tables.Entry entry =
CONTROL_CODES.decode(inputStream);
if (!isEOL(entry, hasFill)) {
throw new ImageReadException("Expected EOL not found");
}
@@ -560,7 +560,7 @@ public final class T4AndT6Compression {
for (int a0 = 0; a0 < width;) {
int a1;
int a2;
- T4_T6_Tables.Entry entry =
CONTROL_CODES.decode(inputStream);
+ final T4_T6_Tables.Entry entry =
CONTROL_CODES.decode(inputStream);
if (entry == T4_T6_Tables.P) {
fillRange(outputStream, referenceLine, a0, b2,
codingA0Color);
a0 = b2;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
Fri Dec 23 18:59:18 2016
@@ -427,7 +427,7 @@ public class GifImageParser extends Imag
}
private GifBlock findBlock(final List<GifBlock> blocks, final int code) {
- for (GifBlock gifBlock : blocks) {
+ for (final GifBlock gifBlock : blocks) {
if (gifBlock.blockCode == code) {
return gifBlock;
}
@@ -505,7 +505,7 @@ public class GifImageParser extends Imag
final List<String> result = new ArrayList<>();
final int code = 0x21fe;
- for (GifBlock block : blocks) {
+ for (final GifBlock block : blocks) {
if (block.blockCode == code) {
final byte[] bytes = ((GenericGifBlock)
block).appendSubBlocks();
result.add(new String(bytes, "US-ASCII"));
@@ -1014,7 +1014,7 @@ public class GifImageParser extends Imag
final List<GifBlock> blocks = readBlocks(ghi, is, true,
formatCompliance);
final List<String> result = new ArrayList<>();
- for (GifBlock block : blocks) {
+ for (final GifBlock block : blocks) {
if (block.blockCode != XMP_COMPLETE_CODE) {
continue;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Fri Dec 23 18:59:18 2016
@@ -100,7 +100,7 @@ public class JpegImageMetadata implement
return null;
}
final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
- for (ImageMetadataItem d : dirs) {
+ for (final ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir =
(TiffImageMetadata.Directory) d;
byte[] data = null;
@@ -132,7 +132,7 @@ public class JpegImageMetadata implement
}
final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
- for (ImageMetadataItem d : dirs) {
+ for (final ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir =
(TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
BufferedImage image = dir.getThumbnail();
@@ -172,7 +172,7 @@ public class JpegImageMetadata implement
return null;
}
final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
- for (ImageMetadataItem d : dirs) {
+ for (final ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir =
(TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
final TiffImageData rawImageData = dir.getTiffImageData();
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
Fri Dec 23 18:59:18 2016
@@ -202,7 +202,7 @@ public class JpegImageParser extends Ima
private byte[] assembleSegments(final List<App2Segment> segments) throws
ImageReadException {
try {
return assembleSegments(segments, false);
- } catch (ImageReadException e) {
+ } catch (final ImageReadException e) {
return assembleSegments(segments, true);
}
}
@@ -250,7 +250,7 @@ public class JpegImageParser extends Ima
final byte[] result = new byte[total];
int progress = 0;
- for (App2Segment segment : segments) {
+ for (final App2Segment segment : segments) {
System.arraycopy(segment.getIccBytes(), 0, result, progress,
segment.getIccBytes().length);
progress += segment.getIccBytes().length;
}
@@ -284,7 +284,7 @@ public class JpegImageParser extends Ima
final List<App2Segment> filtered = new ArrayList<>();
if (segments != null) {
// throw away non-icc profile app2 segments.
- for (Segment s : segments) {
+ for (final Segment s : segments) {
final App2Segment segment = (App2Segment) s;
if (segment.getIccBytes() != null) {
filtered.add(segment);
@@ -331,7 +331,7 @@ public class JpegImageParser extends Ima
private List<Segment> filterAPP1Segments(final List<Segment> segments) {
final List<Segment> result = new ArrayList<>();
- for (Segment s : segments) {
+ for (final Segment s : segments) {
final GenericSegment segment = (GenericSegment) s;
if (isExifAPP1Segment(segment)) {
result.add(segment);
@@ -593,7 +593,7 @@ public class JpegImageParser extends Ima
PhotoshopApp13Data photoshopApp13Data = null;
- for (Segment s : segments) {
+ for (final Segment s : segments) {
final App13Segment segment = (App13Segment) s;
final PhotoshopApp13Data data =
segment.parsePhotoshopSegment(params);
@@ -793,7 +793,7 @@ public class JpegImageParser extends Ima
final List<String> comments = new ArrayList<>();
final List<Segment> commentSegments = readSegments(byteSource,
new int[] { JpegConstants.COM_MARKER}, false);
- for (Segment commentSegment : commentSegments) {
+ for (final Segment commentSegment : commentSegments) {
final ComSegment comSegment = (ComSegment) commentSegment;
String comment = "";
try {
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
Fri Dec 23 18:59:18 2016
@@ -34,7 +34,7 @@ public class JpegPhotoshopMetadata exten
final List<IptcRecord> records = photoshopApp13Data.getRecords();
Collections.sort(records, IptcRecord.COMPARATOR);
- for (IptcRecord element : records) {
+ for (final IptcRecord element : records) {
if (element.iptcType != IptcTypes.RECORD_VERSION) {
add(element.getIptcTypeName(), element.getValue());
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
Fri Dec 23 18:59:18 2016
@@ -114,7 +114,7 @@ public class IptcParser extends BinaryFi
final List<IptcBlock> blocks = parseAllBlocks(bytes, verbose, strict);
- for (IptcBlock block : blocks) {
+ for (final IptcBlock block : blocks) {
// Ignore everything but IPTC data.
if (!block.isIPTCBlock()) {
continue;
@@ -357,7 +357,7 @@ public class IptcParser extends BinaryFi
JpegConstants.PHOTOSHOP_IDENTIFICATION_STRING.writeTo(bos);
final List<IptcBlock> blocks = data.getRawBlocks();
- for (IptcBlock block : blocks) {
+ for (final IptcBlock block : blocks) {
bos.write4Bytes(JpegConstants.CONST_8BIM);
if (block.blockType < 0 || block.blockType > 0xffff) {
@@ -419,7 +419,7 @@ public class IptcParser extends BinaryFi
// TODO: make sure order right
// write the list.
- for (IptcRecord element : elements) {
+ for (final IptcRecord element : elements) {
if (element.iptcType == IptcTypes.RECORD_VERSION) {
continue; // ignore
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
Fri Dec 23 18:59:18 2016
@@ -300,8 +300,8 @@ public class JpegIptcRewriter extends Jp
newData = new PhotoshopApp13Data(newData.getRecords(), newBlocks);
- byte[] segmentBytes = new
IptcParser().writePhotoshopApp13Segment(newData);
- JFIFPieceSegment newSegment = new
JFIFPieceSegment(JpegConstants.JPEG_APP13_MARKER, segmentBytes);
+ final byte[] segmentBytes = new
IptcParser().writePhotoshopApp13Segment(newData);
+ final JFIFPieceSegment newSegment = new
JFIFPieceSegment(JpegConstants.JPEG_APP13_MARKER, segmentBytes);
newPieces = insertAfterLastAppSegments(newPieces,
Arrays.asList(newSegment));
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
Fri Dec 23 18:59:18 2016
@@ -40,7 +40,7 @@ public class PhotoshopApp13Data {
public List<IptcBlock> getNonIptcBlocks() {
final List<IptcBlock> result = new ArrayList<>();
- for (IptcBlock block : rawBlocks) {
+ for (final IptcBlock block : rawBlocks) {
if (!block.isIPTCBlock()) {
result.add(block);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
Fri Dec 23 18:59:18 2016
@@ -251,7 +251,7 @@ public class JpegRewriter extends Binary
final SegmentFilter filter, final boolean reverse) {
final List<T> result = new ArrayList<>();
- for (T piece : segments) {
+ for (final T piece : segments) {
if (piece instanceof JFIFPieceSegment) {
if (filter.filter((JFIFPieceSegment) piece) ^ !reverse) {
result.add(piece);
@@ -322,7 +322,7 @@ public class JpegRewriter extends Binary
try (DataOutputStream os = new DataOutputStream(outputStream)) {
JpegConstants.SOI.writeTo(os);
- for (JFIFPiece piece : segments) {
+ for (final JFIFPiece piece : segments) {
piece.write(os);
}
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java
Fri Dec 23 18:59:18 2016
@@ -88,10 +88,10 @@ public enum ChunkType {
final int value;
private ChunkType() {
- char[] chars = name().toCharArray();
+ final char[] chars = name().toCharArray();
try {
array = name().getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
+ } catch (final UnsupportedEncodingException e) {
// will not happen since UTF-8 is one of the StandardCharsets of
the Java platform
throw new RuntimeException(e);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java
Fri Dec 23 18:59:18 2016
@@ -64,7 +64,7 @@ public enum PngColorType {
}
public static PngColorType getColorType(final int value) {
- for (PngColorType type : values()) {
+ for (final PngColorType type : values()) {
if (type.value == value) {
return type;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
Fri Dec 23 18:59:18 2016
@@ -112,7 +112,7 @@ public class PngImageParser extends Imag
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(is, null, false);
final List<String> chunkTypes = new ArrayList<>();
- for (PngChunk chunk : chunks) {
+ for (final PngChunk chunk : chunks) {
chunkTypes.add(getChunkTypeName(chunk.chunkType));
}
return chunkTypes;
@@ -281,7 +281,7 @@ public class PngImageParser extends Imag
final GenericImageMetadata result = new GenericImageMetadata();
- for (PngChunk chunk : chunks) {
+ for (final PngChunk chunk : chunks) {
final PngTextChunk textChunk = (PngTextChunk) chunk;
result.add(textChunk.getKeyword(), textChunk.getText());
@@ -293,7 +293,7 @@ public class PngImageParser extends Imag
private List<PngChunk> filterChunks(final List<PngChunk> chunks, final
ChunkType type) {
final List<PngChunk> result = new ArrayList<>();
- for (PngChunk chunk : chunks) {
+ for (final PngChunk chunk : chunks) {
if (chunk.chunkType == type.value) {
result.add(chunk);
}
@@ -378,7 +378,7 @@ public class PngImageParser extends Imag
throw new ImageReadException("PNG contains more than one sCAL:"
+ sCALs.size());
} else if (sCALs.size() == 1) {
- PngChunkScal pngChunkScal = (PngChunkScal) sCALs.get(0);
+ final PngChunkScal pngChunkScal = (PngChunkScal) sCALs.get(0);
if (pngChunkScal.unitSpecifier == 1) {
physicalScale =
PhysicalScale.createFromMeters(pngChunkScal.unitsPerPixelXAxis,
pngChunkScal.unitsPerPixelYAxis);
@@ -395,17 +395,17 @@ public class PngImageParser extends Imag
final List<String> comments = new ArrayList<>();
final List<PngText> textChunks = new ArrayList<>();
- for (PngChunk tEXt : tEXts) {
+ for (final PngChunk tEXt : tEXts) {
final PngChunkText pngChunktEXt = (PngChunkText) tEXt;
comments.add(pngChunktEXt.keyword + ": " + pngChunktEXt.text);
textChunks.add(pngChunktEXt.getContents());
}
- for (PngChunk zTXt : zTXts) {
+ for (final PngChunk zTXt : zTXts) {
final PngChunkZtxt pngChunkzTXt = (PngChunkZtxt) zTXt;
comments.add(pngChunkzTXt.keyword + ": " + pngChunkzTXt.text);
textChunks.add(pngChunkzTXt.getContents());
}
- for (PngChunk iTXt : iTXts) {
+ for (final PngChunk iTXt : iTXts) {
final PngChunkItxt pngChunkiTXt = (PngChunkItxt) iTXt;
comments.add(pngChunkiTXt.keyword + ": " + pngChunkiTXt.text);
textChunks.add(pngChunkiTXt.getContents());
@@ -530,7 +530,7 @@ public class PngImageParser extends Imag
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (PngChunk IDAT : IDATs) {
+ for (final PngChunk IDAT : IDATs) {
final PngChunkIdat pngChunkIDAT = (PngChunkIdat) IDAT;
final byte[] bytes = pngChunkIDAT.getBytes();
// System.out.println(i + ": bytes: " + bytes.length);
@@ -717,7 +717,7 @@ public class PngImageParser extends Imag
}
final List<PngChunkItxt> xmpChunks = new ArrayList<>();
- for (PngChunk chunk : chunks) {
+ for (final PngChunk chunk : chunks) {
final PngChunkItxt itxtChunk = (PngChunkItxt) chunk;
if (!itxtChunk.getKeyword().equals(PngConstants.XMP_KEYWORD)) {
continue;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
Fri Dec 23 18:59:18 2016
@@ -312,7 +312,7 @@ class PngWriter {
private byte getBitDepth(final PngColorType pngColorType, final
Map<String, Object> params) {
byte depth = 8;
- Object o = params.get(PngConstants.PARAM_KEY_PNG_BIT_DEPTH);
+ final Object o = params.get(PngConstants.PARAM_KEY_PNG_BIT_DEPTH);
if (o instanceof Number) {
depth = ((Number) o).byteValue();
}
@@ -543,7 +543,7 @@ class PngWriter {
if (params.containsKey(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS)) {
final List<?> outputTexts = (List<?>)
params.get(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS);
- for (Object outputText : outputTexts) {
+ for (final Object outputText : outputTexts) {
final PngText text = (PngText) outputText;
if (text instanceof PngText.Text) {
writeChunktEXt(os, (PngText.Text) text);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
Fri Dec 23 18:59:18 2016
@@ -207,7 +207,7 @@ abstract class ScanExpediter {
throw new ImageReadException("PNG: unknown filterType: " +
filterType);
}
- byte[] scanline = readBytes("scanline", is, length, "PNG: missing
image data");
+ final byte[] scanline = readBytes("scanline", is, length, "PNG:
missing image data");
return unfilterScanline(FilterType.values()[filterType], scanline,
prev, bytesPerPixel);
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -41,14 +41,14 @@ public class PngChunkIhdr extends PngChu
width = read4Bytes("Width", is, "Not a Valid Png File: IHDR Corrupt",
getByteOrder());
height = read4Bytes("Height", is, "Not a Valid Png File: IHDR
Corrupt", getByteOrder());
bitDepth = readByte("BitDepth", is, "Not a Valid Png File: IHDR
Corrupt");
- int type = readByte("ColorType", is, "Not a Valid Png File: IHDR
Corrupt");
+ final int type = readByte("ColorType", is, "Not a Valid Png File: IHDR
Corrupt");
pngColorType = PngColorType.getColorType(type);
if (pngColorType == null) {
throw new ImageReadException("PNG: unknown color type: " + type);
}
compressionMethod = readByte("CompressionMethod", is, "Not a Valid Png
File: IHDR Corrupt");
filterMethod = readByte("FilterMethod", is, "Not a Valid Png File:
IHDR Corrupt");
- int method = readByte("InterlaceMethod", is, "Not a Valid Png File:
IHDR Corrupt");
+ final int method = readByte("InterlaceMethod", is, "Not a Valid Png
File: IHDR Corrupt");
if (method < 0 && method >= InterlaceMethod.values().length) {
throw new ImageReadException("PNG: unknown interlace method: " +
method);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java
Fri Dec 23 18:59:18 2016
@@ -57,7 +57,7 @@ public class PngChunkScal extends PngChu
private double toDouble(final String str) throws ImageReadException {
try {
return Double.valueOf(str);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
throw new ImageReadException("PNG sCAL error reading axis value - " +
str);
}
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -66,7 +66,7 @@ public class ScanlineFilterPaeth impleme
}
// upperleft = 255;
- int paethPredictor = paethPredictor(0xff & left, 0xff & above,
0xff & upperleft);
+ final int paethPredictor = paethPredictor(0xff & left, 0xff &
above, 0xff & upperleft);
dst[i] = (byte) ((src[i] + paethPredictor) % 256);
// dst[i] = (byte) ((src[i] + paethPredictor) );
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -29,7 +29,7 @@ public class TransparencyFilterGrayscale
public TransparencyFilterGrayscale(final byte[] bytes) throws IOException {
super(bytes);
- ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+ final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
transparentColor = read2Bytes("transparentColor", is, "tRNS: Missing
transparentColor", getByteOrder());
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -29,10 +29,10 @@ public class TransparencyFilterTrueColor
public TransparencyFilterTrueColor(final byte[] bytes) throws IOException {
super(bytes);
- ByteArrayInputStream is = new ByteArrayInputStream(bytes);
- int transparentRed = read2Bytes("transparentRed", is, "tRNS: Missing
transparentColor", getByteOrder());
- int transparentGreen = read2Bytes("transparentGreen", is, "tRNS:
Missing transparentColor", getByteOrder());
- int transparentBlue = read2Bytes("transparentBlue", is, "tRNS: Missing
transparentColor", getByteOrder());
+ final ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+ final int transparentRed = read2Bytes("transparentRed", is, "tRNS:
Missing transparentColor", getByteOrder());
+ final int transparentGreen = read2Bytes("transparentGreen", is, "tRNS:
Missing transparentColor", getByteOrder());
+ final int transparentBlue = read2Bytes("transparentBlue", is, "tRNS:
Missing transparentColor", getByteOrder());
transparentColor = ((0xff & transparentRed) << 16)
| ((0xff & transparentGreen) << 8)
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -103,13 +103,13 @@ public class PnmImageParser extends Imag
final int width;
try {
width = Integer.parseInt(wsr.readtoWhiteSpace());
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
throw new ImageReadException("Invalid width specified." , e);
}
final int height;
try {
height = Integer.parseInt(wsr.readtoWhiteSpace());
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
throw new ImageReadException("Invalid height specified." , e);
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -114,7 +114,7 @@ class ImageResourceType {
};
public static String getDescription(final int id) {
- for (ImageResourceType type : TYPES) {
+ for (final ImageResourceType type : TYPES) {
if (type.from <= id && id <= type.to) {
return type.description;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
Fri Dec 23 18:59:18 2016
@@ -38,11 +38,11 @@ public class TiffContents {
result.add(header);
- for (TiffDirectory directory : directories) {
+ for (final TiffDirectory directory : directories) {
result.add(directory);
final List<TiffField> fields = directory.entries;
- for (TiffField field : fields) {
+ for (final TiffField field : fields) {
final TiffElement oversizeValue =
field.getOversizeValueElement();
if (null != oversizeValue) {
result.add(oversizeValue);
@@ -61,7 +61,7 @@ public class TiffContents {
}
public TiffField findField(final TagInfo tag) throws ImageReadException {
- for (TiffDirectory directory : directories) {
+ for (final TiffDirectory directory : directories) {
final TiffField field = directory.findField(tag);
if (null != field) {
return field;
@@ -77,7 +77,7 @@ public class TiffContents {
Collections.sort(elements, TiffElement.COMPARATOR);
long lastEnd = 0;
- for (TiffElement element : elements) {
+ for (final TiffElement element : elements) {
if (element.offset > lastEnd) {
Debug.debug("\t" + "gap: " + (element.offset - lastEnd));
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -87,7 +87,7 @@ public class TiffDirectory extends TiffE
long entryOffset = offset + TiffConstants.TIFF_DIRECTORY_HEADER_LENGTH;
final StringBuilder result = new StringBuilder();
- for (TiffField entry : entries) {
+ for (final TiffField entry : entries) {
result.append(String.format("\t[%d]: %s (%d, 0x%x), %s, %d: %s%n",
entryOffset, entry.getTagInfo().name,
entry.getTag(), entry.getTag(),
@@ -126,7 +126,7 @@ public class TiffDirectory extends TiffE
}
public void dump() {
- for (TiffField entry : entries) {
+ for (final TiffField entry : entries) {
entry.dump();
}
@@ -178,7 +178,7 @@ public class TiffDirectory extends TiffE
return null;
}
- for (TiffField field : entries) {
+ for (final TiffField field : entries) {
if (field.getTag() == tag.tag) {
return field;
}
@@ -766,8 +766,8 @@ public class TiffDirectory extends TiffE
}
public ImageDataElement getJpegRawImageDataElement() throws
ImageReadException {
- TiffField jpegInterchangeFormat =
findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT);
- TiffField jpegInterchangeFormatLength =
findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+ final TiffField jpegInterchangeFormat =
findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT);
+ final TiffField jpegInterchangeFormatLength =
findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
if (jpegInterchangeFormat != null && jpegInterchangeFormatLength !=
null) {
final int offSet = jpegInterchangeFormat.getIntArrayValue()[0];
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=1775889&r1=1775888&r2=1775889&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 Dec 23 18:59:18 2016
@@ -111,7 +111,7 @@ public class TiffImageMetadata extends G
byteOrder);
final List<? extends ImageMetadataItem> entries = getItems();
- for (ImageMetadataItem entry : entries) {
+ for (final ImageMetadataItem entry : entries) {
final TiffMetadataItem item = (TiffMetadataItem) entry;
final TiffField srcField = item.getTiffField();
@@ -169,7 +169,7 @@ public class TiffImageMetadata extends G
final List<ImageMetadataItem> result = new ArrayList<>();
final List<? extends ImageMetadataItem> items = super.getItems();
- for (ImageMetadataItem item : items) {
+ for (final ImageMetadataItem item : items) {
final Directory dir = (Directory) item;
result.addAll(dir.getItems());
}
@@ -197,7 +197,7 @@ public class TiffImageMetadata extends G
final TiffOutputSet result = new TiffOutputSet(byteOrder);
final List<? extends ImageMetadataItem> srcDirs = getDirectories();
- for (ImageMetadataItem srcDir1 : srcDirs) {
+ for (final ImageMetadataItem srcDir1 : srcDirs) {
final Directory srcDir = (Directory) srcDir1;
if (null != result.findDirectory(srcDir.type)) {
@@ -227,7 +227,7 @@ public class TiffImageMetadata extends G
final List<? extends ImageMetadataItem> directories = getDirectories();
if (exactDirectoryMatch
|| tagInfo.directoryType !=
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) {
- for (ImageMetadataItem directory1 : directories) {
+ for (final ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (directory.type == tagInfo.directoryType.directoryType) {
final TiffField field = directory.findField(tagInfo);
@@ -239,7 +239,7 @@ public class TiffImageMetadata extends G
if (exactDirectoryMatch || tagsMatching > 1) {
return null;
}
- for (ImageMetadataItem directory1 : directories) {
+ for (final ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (tagInfo.directoryType.isImageDirectory()
&& directory.type >= 0) {
@@ -257,7 +257,7 @@ public class TiffImageMetadata extends G
}
}
- for (ImageMetadataItem directory1 : directories) {
+ for (final ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
final TiffField field = directory.findField(tagInfo);
if (field != null) {
@@ -426,7 +426,7 @@ public class TiffImageMetadata extends G
public TiffDirectory findDirectory(final int directoryType) {
final List<? extends ImageMetadataItem> directories = getDirectories();
- for (ImageMetadataItem directory1 : directories) {
+ for (final ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (directory.type == directoryType) {
return directory.directory;
@@ -438,7 +438,7 @@ public class TiffImageMetadata extends G
public List<TiffField> getAllFields() {
final List<TiffField> result = new ArrayList<>();
final List<? extends ImageMetadataItem> directories = getDirectories();
- for (ImageMetadataItem directory1 : directories) {
+ for (final ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
result.addAll(directory.getAllFields());
}
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=1775889&r1=1775888&r2=1775889&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 Dec 23 18:59:18 2016
@@ -127,13 +127,13 @@ public class TiffImageParser extends Ima
final TiffImageMetadata result = new TiffImageMetadata(contents);
- for (TiffDirectory dir : directories) {
+ for (final TiffDirectory dir : directories) {
final TiffImageMetadata.Directory metadataDirectory = new
TiffImageMetadata.Directory(
tiffReader.getByteOrder(), dir);
final List<TiffField> entries = dir.getDirectoryEntries();
- for (TiffField entry : entries) {
+ for (final TiffField entry : entries) {
metadataDirectory.add(entry);
}
@@ -229,7 +229,7 @@ public class TiffImageParser extends Ima
final List<String> comments = new ArrayList<>();
final List<TiffField> entries = directory.entries;
- for (TiffField field : entries) {
+ for (final TiffField field : entries) {
final String comment = field.toString();
comments.add(comment);
}
@@ -365,7 +365,7 @@ public class TiffImageParser extends Ima
// Debug.debug("directory offset", directory.offset);
- for (TiffField field : entries) {
+ for (final TiffField field : entries) {
field.dump(pw, Integer.toString(d));
}
}
@@ -405,7 +405,7 @@ public class TiffImageParser extends Ima
for (int i = 0; i < contents.directories.size(); i++) {
final TiffDirectory directory = contents.directories.get(i);
final List<ImageDataElement> dataElements =
directory.getTiffRawImageDataElements();
- for (ImageDataElement element : dataElements) {
+ for (final ImageDataElement element : dataElements) {
final byte[] bytes = byteSource.getBlock(element.offset,
element.length);
result.add(bytes);
@@ -507,10 +507,10 @@ public class TiffImageParser extends Ima
final Map<String, Object> params)
throws ImageReadException
{
- Integer ix0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_X,
params);
- Integer iy0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_Y,
params);
- Integer iwidth =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, params);
- Integer iheight =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, params);
+ final Integer ix0 =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_X, params);
+ final Integer iy0 =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_Y, params);
+ final Integer iwidth =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, params);
+ final Integer iheight =
getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, params);
if (ix0 == null && iy0 == null && iwidth == null && iheight == null) {
return null;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
Fri Dec 23 18:59:18 2016
@@ -83,7 +83,7 @@ final class TiffTags {
// make sure to use the thread-safe version; this is shared state.
final Map<Integer, List<TagInfo>> map = new HashMap<>();
- for (TagInfo tag : tags) {
+ for (final TagInfo tag : tags) {
List<TagInfo> tagList = map.get(tag.tag);
if (tagList == null) {
tagList = new ArrayList<>();
@@ -98,7 +98,7 @@ final class TiffTags {
private static Map<Integer, Integer> countTags(final List<TagInfo> tags) {
final Map<Integer, Integer> map = new HashMap<>();
- for (TagInfo tag : tags) {
+ for (final TagInfo tag : tags) {
final Integer count = map.get(tag.tag);
if (count == null) {
map.put(tag.tag, 1);
@@ -132,7 +132,7 @@ final class TiffTags {
}
// first search for exact match.
- for (TagInfo tagInfo : possibleMatches) {
+ for (final TagInfo tagInfo : possibleMatches) {
if (tagInfo.directoryType ==
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) {
// pass
continue;
@@ -142,7 +142,7 @@ final class TiffTags {
}
// accept an inexact match.
- for (TagInfo tagInfo : possibleMatches) {
+ for (final TagInfo tagInfo : possibleMatches) {
if (tagInfo.directoryType ==
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) {
// pass
continue;
@@ -156,7 +156,7 @@ final class TiffTags {
}
// accept a wildcard match.
- for (TagInfo tagInfo : possibleMatches) {
+ for (final TagInfo tagInfo : possibleMatches) {
if (tagInfo.directoryType ==
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) {
return tagInfo;
}
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=1775889&r1=1775888&r2=1775889&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 Dec 23 18:59:18 2016
@@ -79,7 +79,7 @@ public abstract class TiffImageWriterBas
final List<Integer> directoryIndices = new ArrayList<>();
final Map<Integer, TiffOutputDirectory> directoryTypeMap = new
HashMap<>();
- for (TiffOutputDirectory directory : directories) {
+ for (final TiffOutputDirectory directory : directories) {
final int dirType = directory.type;
directoryTypeMap.put(dirType, directory);
// Debug.debug("validating dirType", dirType + " ("
@@ -126,7 +126,7 @@ public abstract class TiffImageWriterBas
final HashSet<Integer> fieldTags = new HashSet<>();
final List<TiffOutputField> fields = directory.getFields();
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
if (fieldTags.contains(field.tag)) {
throw new ImageWriteException("Tag ("
+ field.tagInfo.getDescription()
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -84,7 +84,7 @@ public class TiffImageWriterLossless ext
for (final TiffDirectory directory : directories) {
elements.add(directory);
- for (TiffField field : directory.getDirectoryEntries()) {
+ for (final TiffField field : directory.getDirectoryEntries()) {
final TiffElement oversizeValue =
field.getOversizeValueElement();
if (oversizeValue != null) {
final TiffOutputField frozenField =
frozenFields.get(field.getTag());
@@ -232,7 +232,7 @@ public class TiffImageWriterLossless ext
// search for the smallest possible element large enough to hold
the
// item.
TiffElement bestFit = null;
- for (TiffElement element : unusedElements) {
+ for (final TiffElement element : unusedElements) {
if (element.length >= outputItemLength) {
bestFit = element;
} else {
@@ -314,7 +314,7 @@ public class TiffImageWriterLossless ext
}
// write in the new items
- for (TiffOutputItem outputItem : outputItems) {
+ for (final TiffOutputItem outputItem : outputItems) {
final BufferOutputStream tos = new BufferOutputStream(output,
(int) outputItem.getOffset());
final BinaryOutputStream bos = new BinaryOutputStream(tos,
byteOrder);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
Fri Dec 23 18:59:18 2016
@@ -55,7 +55,7 @@ public class TiffImageWriterLossy extend
private void updateOffsetsStep(final List<TiffOutputItem> outputItems) {
int offset = TIFF_HEADER_SIZE;
- for (TiffOutputItem outputItem : outputItems) {
+ for (final TiffOutputItem outputItem : outputItems) {
outputItem.setOffset(offset);
final int itemLength = outputItem.getItemLength();
offset += itemLength;
@@ -70,7 +70,7 @@ public class TiffImageWriterLossy extend
ImageWriteException {
writeImageFileHeader(bos);
- for (TiffOutputItem outputItem : outputItems) {
+ for (final TiffOutputItem outputItem : outputItems) {
outputItem.writeItem(bos);
final int length = outputItem.getItemLength();
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -553,7 +553,7 @@ public final class TiffOutputDirectory e
public void removeField(final int tag) {
final List<TiffOutputField> matches = new ArrayList<>();
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
if (field.tag == tag) {
matches.add(field);
}
@@ -588,7 +588,7 @@ public final class TiffOutputDirectory e
* @see #findField(TagInfo)
*/
public TiffOutputField findField(final int tag) {
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
if (field.tag == tag) {
return field;
}
@@ -620,7 +620,7 @@ public final class TiffOutputDirectory e
bos.write2Bytes(fields.size()); // DirectoryFieldCount
// Write Fields
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
field.writeField(bos);
// Debug.debug("\t" + "writing field (" + field.tag + ", 0x" +
@@ -730,8 +730,8 @@ public final class TiffOutputDirectory e
// TiffOutputField imageDataOffsetsField = null;
- int[] imageDataOffsets = new int[imageData.length];
- int[] imageDataByteCounts = new int[imageData.length];
+ final int[] imageDataOffsets = new int[imageData.length];
+ final int[] imageDataByteCounts = new int[imageData.length];
for (int i = 0; i < imageData.length; i++) {
imageDataByteCounts[i] = imageData[i].length;
}
@@ -764,7 +764,7 @@ public final class TiffOutputDirectory e
result.add(this);
sortFields();
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
if (field.isLocalValue()) {
continue;
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
Fri Dec 23 18:59:18 2016
@@ -47,7 +47,7 @@ public final class TiffOutputSet {
final TiffOutputSummary outputSummary) throws ImageWriteException {
final List<TiffOutputItem> result = new ArrayList<>();
- for (TiffOutputDirectory directory : directories) {
+ for (final TiffOutputDirectory directory : directories) {
result.addAll(directory.getOutputItems(outputSummary));
}
@@ -117,7 +117,7 @@ public final class TiffOutputSet {
}
public TiffOutputDirectory findDirectory(final int directoryType) {
- for (TiffOutputDirectory directory : directories) {
+ for (final TiffOutputDirectory directory : directories) {
if (directory.type == directoryType) {
return directory;
}
@@ -195,7 +195,7 @@ public final class TiffOutputSet {
}
public void removeField(final int tag) {
- for (TiffOutputDirectory directory : directories) {
+ for (final TiffOutputDirectory directory : directories) {
directory.removeField(tag);
}
}
@@ -205,7 +205,7 @@ public final class TiffOutputSet {
}
public TiffOutputField findField(final int tag) {
- for (TiffOutputDirectory directory : directories) {
+ for (final TiffOutputDirectory directory : directories) {
final TiffOutputField field = directory.findField(tag);
if (null != field) {
return field;
@@ -272,7 +272,7 @@ public final class TiffOutputSet {
prefix, i, directory.description(), directory.type));
final List<TiffOutputField> fields = directory.getFields();
- for (TiffOutputField field : fields) {
+ for (final TiffOutputField field : fields) {
result.append(prefix);
result.append("\t\tfield " + i + ": " + field.tagInfo);
result.append(NEWLINE);
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -57,13 +57,13 @@ class TiffOutputSummary {
}
public void updateOffsets(final ByteOrder byteOrder) throws
ImageWriteException {
- for (OffsetItem offset : offsetItems) {
+ for (final OffsetItem offset : offsetItems) {
final byte[] value = FieldType.LONG.writeData(
(int) offset.item.getOffset(), byteOrder);
offset.itemOffsetField.setData(value);
}
- for (ImageDataOffsets imageDataInfo : imageDataItems) {
+ for (final ImageDataOffsets imageDataInfo : imageDataItems) {
for (int j = 0; j < imageDataInfo.outputItems.length; j++) {
final TiffOutputItem item = imageDataInfo.outputItems[j];
imageDataInfo.imageDataOffsets[j] = (int) item.getOffset();
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -267,10 +267,10 @@ public class XbmImageParser extends Imag
}
}
- int[] palette = { 0xffffff, 0x000000 };
- ColorModel colorModel = new IndexColorModel(1, 2, palette, 0, false,
-1, DataBuffer.TYPE_BYTE);
- DataBufferByte dataBuffer = new DataBufferByte(imageData,
imageData.length);
- WritableRaster raster = Raster.createPackedRaster(dataBuffer,
xbmHeader.width, xbmHeader.height, 1, null);
+ final int[] palette = { 0xffffff, 0x000000 };
+ final ColorModel colorModel = new IndexColorModel(1, 2, palette, 0,
false, -1, DataBuffer.TYPE_BYTE);
+ final DataBufferByte dataBuffer = new DataBufferByte(imageData,
imageData.length);
+ final WritableRaster raster = Raster.createPackedRaster(dataBuffer,
xbmHeader.width, xbmHeader.height, 1, null);
return new BufferedImage(colorModel, raster,
colorModel.isAlphaPremultiplied(), new Properties());
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -68,7 +68,7 @@ public class IccProfileParser extends Bi
try {
is = byteSource.getInputStream();
- IccProfileInfo result = readICCProfileInfo(is);
+ final IccProfileInfo result = readICCProfileInfo(is);
if (result == null) {
return null;
@@ -332,7 +332,7 @@ public class IccProfileParser extends Bi
printCharQuad("DeviceModel", deviceModel);
}
- boolean result = deviceManufacturer == IccConstants.IEC &&
deviceModel == IccConstants.sRGB;
+ final boolean result = deviceManufacturer == IccConstants.IEC &&
deviceModel == IccConstants.sRGB;
return result;
}
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
Fri Dec 23 18:59:18 2016
@@ -55,7 +55,7 @@ class ColorGroup {
}
int total = 0;
- for (ColorCount color : colorCounts) {
+ for (final ColorCount color : colorCounts) {
total += color.count;
minAlpha = Math.min(minAlpha, color.alpha);
@@ -107,7 +107,7 @@ class ColorGroup {
long greenTotal = 0;
long blueTotal = 0;
- for (ColorCount color : colorCounts) {
+ for (final ColorCount color : colorCounts) {
countTotal += color.count;
alphaTotal += color.count * color.alpha;
redTotal += color.count * color.red;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
Fri Dec 23 18:59:18 2016
@@ -114,9 +114,9 @@ public class LongestAxisMedianCut implem
colorGroup.colorCounts.subList(medianIndex + 1,
colorGroup.colorCounts.size()));
- ColorGroup less = new ColorGroup(new ArrayList<>(colorCounts1),
ignoreAlpha);
+ final ColorGroup less = new ColorGroup(new ArrayList<>(colorCounts1),
ignoreAlpha);
colorGroups.add(less);
- ColorGroup more = new ColorGroup(new ArrayList<>(colorCounts2),
ignoreAlpha);
+ final ColorGroup more = new ColorGroup(new ArrayList<>(colorCounts2),
ignoreAlpha);
colorGroups.add(more);
final ColorCount medianValue = colorGroup.colorCounts.get(medianIndex);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
Fri Dec 23 18:59:18 2016
@@ -31,7 +31,7 @@ public class MostPopulatedBoxesMedianCut
final boolean ignoreAlpha) throws ImageWriteException {
int maxPoints = 0;
ColorGroup colorGroup = null;
- for (ColorGroup group : colorGroups) {
+ for (final ColorGroup group : colorGroups) {
if (group.maxDiff > 0) {
if (group.totalPoints > maxPoints) {
colorGroup = group;
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -202,8 +202,8 @@ public class PaletteFactory {
}
}
- int sum2 = sum1 - last;
- int slice2 = slice1 - 1;
+ final int sum2 = sum1 - last;
+ final int slice2 = slice1 - 1;
final DivisionCandidate dc1 = finishDivision(subset, component,
precision, sum1, slice1);
final DivisionCandidate dc2 = finishDivision(subset, component,
precision, sum2, slice2);
@@ -231,7 +231,7 @@ public class PaletteFactory {
DivisionCandidate bestV = null;
double bestScore = Double.MAX_VALUE;
- for (DivisionCandidate dc : dcs) {
+ for (final DivisionCandidate dc : dcs) {
final ColorSpaceSubset first = dc.dst_a;
final ColorSpaceSubset second = dc.dst_b;
final int area1 = first.total;
@@ -273,7 +273,7 @@ public class PaletteFactory {
int maxArea = -1;
ColorSpaceSubset maxSubset = null;
- for (ColorSpaceSubset subset : v) {
+ for (final ColorSpaceSubset subset : v) {
if (ignore.contains(subset)) {
continue;
}
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=1775889&r1=1775888&r2=1775889&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
Fri Dec 23 18:59:18 2016
@@ -229,7 +229,7 @@ public final class Debug {
final String suffix = " [" + counter++ + "]";
debug(message + " (" + v.size() + ")" + suffix);
- for (Object aV : v) {
+ for (final Object aV : v) {
debug("\t" + aV.toString() + suffix);
}
debug();
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
Fri Dec 23 18:59:18 2016
@@ -79,7 +79,7 @@ public class ImagingGuessFormatTest exte
@Test
public void testGuessFormat() throws Exception {
- String imagePath = FilenameUtils.separatorsToSystem(pathToFile);
+ final String imagePath = FilenameUtils.separatorsToSystem(pathToFile);
final File imageFile = new File(TEST_IMAGE_FOLDER, imagePath);
final ImageFormat guessedFormat = Imaging.guessFormat(imageFile);
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
Fri Dec 23 18:59:18 2016
@@ -105,7 +105,7 @@ public class ByteSourceImageTest extends
}
public void checkGetBufferedImage(final File file, final byte[] bytes)
throws Exception {
- BufferedImage bufferedImage = Imaging.getBufferedImage(file);
+ final BufferedImage bufferedImage = Imaging.getBufferedImage(file);
assertNotNull(bufferedImage);
assertTrue(bufferedImage.getWidth() > 0);
assertTrue(bufferedImage.getHeight() > 0);
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
Fri Dec 23 18:59:18 2016
@@ -67,7 +67,7 @@ public class AsciiFieldTest extends Exif
TiffTagConstants.TIFF_TAG_DATE_TIME.tag,
"2007:12:25 13:34:39");
- for (Map.Entry<Integer, Object> tag : expectedFieldValues.entrySet()) {
+ for (final Map.Entry<Integer, Object> tag :
expectedFieldValues.entrySet()) {
assertTrue(fieldMap.containsKey(tag.getKey()));
final TiffField field = fieldMap.get(tag.getKey());
assertNotNull(field);
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1775889&r1=1775888&r2=1775889&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
Fri Dec 23 18:59:18 2016
@@ -119,11 +119,11 @@ public class MicrosoftTagTest extends Ex
final TiffImageMetadata metadata =
toTiffMetadata(Imaging.getMetadata(file));
// field values may be duplicated between directories, we have to
check all
- List<Object> authorValues = new ArrayList<>();
- List<Object> commentValues = new ArrayList<>();
- List<Object> subjectValues = new ArrayList<>();
- List<Object> titleValues = new ArrayList<>();
- for (TiffDirectory d : metadata.contents.directories) {
+ final List<Object> authorValues = new ArrayList<>();
+ final List<Object> commentValues = new ArrayList<>();
+ final List<Object> subjectValues = new ArrayList<>();
+ final List<Object> titleValues = new ArrayList<>();
+ for (final TiffDirectory d : metadata.contents.directories) {
titleValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE, false));
authorValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR,
false));
commentValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT,
false));
