Author: damjan
Date: Wed Sep 7 18:08:34 2016
New Revision: 1759654
URL: http://svn.apache.org/viewvc?rev=1759654&view=rev
Log:
Formatting improvements: never break up
object.method()
into
object
.method()
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.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/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.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/decoder/Dct.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.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/pcx/PcxWriter.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/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.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/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/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.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/examples/ImageReadExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.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/IptcUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
Wed Sep 7 18:08:34 2016
@@ -959,8 +959,8 @@ public abstract class ImageParser extend
return new SimpleBufferedImageFactory();
}
- final BufferedImageFactory result = (BufferedImageFactory) params
- .get(ImagingConstants.BUFFERED_IMAGE_FACTORY);
+ final BufferedImageFactory result = (BufferedImageFactory) params.get(
+ ImagingConstants.BUFFERED_IMAGE_FACTORY);
if (null != result) {
return result;
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -179,8 +179,7 @@ public final class T4AndT6Compression {
for (int y = 0; y < height; y++) {
compress1DLine(inputStream, outputStream, null, width);
if (hasFill) {
- int bitsAvailable = outputStream
- .getBitsAvailableInCurrentByte();
+ int bitsAvailable =
outputStream.getBitsAvailableInCurrentByte();
if (bitsAvailable < 4) {
outputStream.flush();
bitsAvailable = 8;
@@ -326,8 +325,7 @@ public final class T4AndT6Compression {
compress1DLine(inputStream, outputStream, referenceLine,
width);
}
if (hasFill) {
- int bitsAvailable = outputStream
- .getBitsAvailableInCurrentByte();
+ int bitsAvailable =
outputStream.getBitsAvailableInCurrentByte();
if (bitsAvailable < 4) {
outputStream.flush();
bitsAvailable = 8;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
Wed Sep 7 18:08:34 2016
@@ -717,8 +717,7 @@ public class BmpImageParser extends Imag
params.remove(PARAM_KEY_FORMAT);
}
if (params.containsKey(PARAM_KEY_PIXEL_DENSITY)) {
- pixelDensity = (PixelDensity) params
- .remove(PARAM_KEY_PIXEL_DENSITY);
+ pixelDensity = (PixelDensity)
params.remove(PARAM_KEY_PIXEL_DENSITY);
}
if (!params.isEmpty()) {
final Object firstKey = params.keySet().iterator().next();
@@ -742,8 +741,7 @@ public class BmpImageParser extends Imag
os.write(0x42); // B, Windows 3.1x, 95, NT, Bitmap
os.write(0x4d); // M
- final int filesize = BITMAP_FILE_HEADER_SIZE + BITMAP_INFO_HEADER_SIZE
+ // header
- // size
+ final int filesize = BITMAP_FILE_HEADER_SIZE + BITMAP_INFO_HEADER_SIZE
+ // header size
4 * writer.getPaletteSize() + // palette size in bytes
imagedata.length;
bos.write4Bytes(filesize);
@@ -764,10 +762,8 @@ public class BmpImageParser extends Imag
bos.write4Bytes(BI_RGB); // Compression
bos.write4Bytes(imagedata.length); // Bitmap Data Size
- bos.write4Bytes(pixelDensity != null ? (int) Math
- .round(pixelDensity.horizontalDensityMetres()) : 0); //
HResolution
- bos.write4Bytes(pixelDensity != null ? (int) Math
- .round(pixelDensity.verticalDensityMetres()) : 0); //
VResolution
+ bos.write4Bytes(pixelDensity != null ? (int)
Math.round(pixelDensity.horizontalDensityMetres()) : 0); // HResolution
+ bos.write4Bytes(pixelDensity != null ? (int)
Math.round(pixelDensity.verticalDensityMetres()) : 0); // VResolution
if (palette == null) {
bos.write4Bytes(0); // Colors
} else {
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
Wed Sep 7 18:08:34 2016
@@ -207,8 +207,7 @@ public class DcxImageParser extends Imag
}
if (params.containsKey(PcxConstants.PARAM_KEY_PCX_COMPRESSION)) {
- final Object value = params
- .remove(PcxConstants.PARAM_KEY_PCX_COMPRESSION);
+ final Object value =
params.remove(PcxConstants.PARAM_KEY_PCX_COMPRESSION);
pcxParams.put(PcxConstants.PARAM_KEY_PCX_COMPRESSION, value);
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -127,8 +127,7 @@ public class GifImageParser extends Imag
formatCompliance.compareBytes("Signature", GIF_HEADER_SIGNATURE,
new byte[]{identifier1, identifier2, identifier3,});
formatCompliance.compare("version", 56, version1);
- formatCompliance
- .compare("version", new int[] { 55, 57, }, version2);
+ formatCompliance.compare("version", new int[] { 55, 57, },
version2);
formatCompliance.compare("version", 97, version3);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
Wed Sep 7 18:08:34 2016
@@ -95,8 +95,7 @@ public class IcnsImageParser extends Ima
}
final IcnsContents contents = readImage(byteSource);
- final List<BufferedImage> images = IcnsDecoder
- .decodeAllImages(contents.icnsElements);
+ final List<BufferedImage> images =
IcnsDecoder.decodeAllImages(contents.icnsElements);
if (images.isEmpty()) {
throw new ImageReadException("No icons in ICNS file");
}
@@ -125,8 +124,7 @@ public class IcnsImageParser extends Ima
}
final IcnsContents contents = readImage(byteSource);
- final List<BufferedImage> images = IcnsDecoder
- .decodeAllImages(contents.icnsElements);
+ final List<BufferedImage> images =
IcnsDecoder.decodeAllImages(contents.icnsElements);
if (images.isEmpty()) {
throw new ImageReadException("No icons in ICNS file");
}
@@ -264,8 +262,7 @@ public class IcnsImageParser extends Ima
public final BufferedImage getBufferedImage(final ByteSource byteSource,
final Map<String, Object> params) throws ImageReadException,
IOException {
final IcnsContents icnsContents = readImage(byteSource);
- final List<BufferedImage> result = IcnsDecoder
- .decodeAllImages(icnsContents.icnsElements);
+ final List<BufferedImage> result =
IcnsDecoder.decodeAllImages(icnsContents.icnsElements);
if (!result.isEmpty()) {
return result.get(0);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
Wed Sep 7 18:08:34 2016
@@ -645,8 +645,7 @@ public class IcoImageParser extends Imag
}
final PaletteFactory paletteFactory = new PaletteFactory();
- final SimplePalette palette = paletteFactory
- .makeExactRgbPaletteSimple(src, 256);
+ final SimplePalette palette =
paletteFactory.makeExactRgbPaletteSimple(src, 256);
final int bitCount;
final boolean hasTransparency = paletteFactory.hasTransparency(src);
if (palette == null) {
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java
Wed Sep 7 18:08:34 2016
@@ -117,15 +117,15 @@ public final class JpegConstants {
public static final int DNL_MARKER = 0xFFdc;
public static final int COM_MARKER = 0xFFfe;
- public static final List<Integer> MARKERS = Collections
- .unmodifiableList(Arrays.asList(JPEG_APP0, JPEG_APP0_MARKER,
- JPEG_APP1_MARKER, JPEG_APP2_MARKER, JPEG_APP13_MARKER,
- JPEG_APP14_MARKER, JPEG_APP15_MARKER, JFIF_MARKER,
- SOF0_MARKER, SOF1_MARKER, SOF2_MARKER, SOF3_MARKER,
DHT_MARKER,
- SOF5_MARKER, SOF6_MARKER, SOF7_MARKER, SOF8_MARKER,
SOF9_MARKER,
- SOF10_MARKER, SOF11_MARKER, DAC_MARKER, SOF13_MARKER,
- SOF14_MARKER, SOF15_MARKER, EOI_MARKER, SOS_MARKER,
DQT_MARKER,
- DNL_MARKER, COM_MARKER));
+ public static final List<Integer> MARKERS =
Collections.unmodifiableList(Arrays.asList(
+ JPEG_APP0, JPEG_APP0_MARKER,
+ JPEG_APP1_MARKER, JPEG_APP2_MARKER, JPEG_APP13_MARKER,
+ JPEG_APP14_MARKER, JPEG_APP15_MARKER, JFIF_MARKER,
+ SOF0_MARKER, SOF1_MARKER, SOF2_MARKER, SOF3_MARKER, DHT_MARKER,
+ SOF5_MARKER, SOF6_MARKER, SOF7_MARKER, SOF8_MARKER, SOF9_MARKER,
+ SOF10_MARKER, SOF11_MARKER, DAC_MARKER, SOF13_MARKER,
+ SOF14_MARKER, SOF15_MARKER, EOI_MARKER, SOS_MARKER, DQT_MARKER,
+ DNL_MARKER, COM_MARKER));
public static final BinaryConstant ICC_PROFILE_LABEL = new BinaryConstant(
new byte[] { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49,
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -562,8 +562,7 @@ public class JpegImageParser extends Ima
if (marker == JpegConstants.JPEG_APP1_MARKER) {
if (new JpegXmpParser().isXmpJpegSegment(segmentData)) {
- result.add(new JpegXmpParser()
- .parseXmpJpegSegment(segmentData));
+ result.add(new
JpegXmpParser().parseXmpJpegSegment(segmentData));
return false;
}
}
@@ -742,22 +741,19 @@ public class JpegImageParser extends Ima
if (metadata != null) {
{
- final TiffField field = metadata
-
.findEXIFValue(TiffTagConstants.TIFF_TAG_XRESOLUTION);
+ final TiffField field =
metadata.findEXIFValue(TiffTagConstants.TIFF_TAG_XRESOLUTION);
if (field != null) {
xDensity = ((Number) field.getValue()).doubleValue();
}
}
{
- final TiffField field = metadata
-
.findEXIFValue(TiffTagConstants.TIFF_TAG_YRESOLUTION);
+ final TiffField field =
metadata.findEXIFValue(TiffTagConstants.TIFF_TAG_YRESOLUTION);
if (field != null) {
yDensity = ((Number) field.getValue()).doubleValue();
}
}
{
- final TiffField field = metadata
-
.findEXIFValue(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT);
+ final TiffField field =
metadata.findEXIFValue(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT);
if (field != null) {
final int densityUnits = ((Number)
field.getValue()).intValue();
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
Wed Sep 7 18:08:34 2016
@@ -85,11 +85,9 @@ final class Dct {
(float) (4.0 * Math.cos(7.0 * Math.PI / 16.0) * 0.125), };
private static final float A1 = (float) (Math.cos(2.0 * Math.PI / 8.0));
- private static final float A2 = (float) (Math.cos(Math.PI / 8.0) - Math
- .cos(3.0 * Math.PI / 8.0));
+ private static final float A2 = (float) (Math.cos(Math.PI / 8.0) -
Math.cos(3.0 * Math.PI / 8.0));
private static final float A3 = A1;
- private static final float A4 = (float) (Math.cos(Math.PI / 8.0) + Math
- .cos(3.0 * Math.PI / 8.0));
+ private static final float A4 = (float) (Math.cos(Math.PI / 8.0) +
Math.cos(3.0 * Math.PI / 8.0));
private static final float A5 = (float) (Math.cos(3.0 * Math.PI / 8.0));
private static final float C2 = (float) (2.0 * Math.cos(Math.PI / 8));
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
Wed Sep 7 18:08:34 2016
@@ -200,8 +200,7 @@ public class JpegDecoder extends BinaryF
} else if (marker == JpegConstants.DQT_MARKER) {
final DqtSegment dqtSegment = new DqtSegment(marker, segmentData);
for (int i = 0; i < dqtSegment.quantizationTables.size(); i++) {
- final DqtSegment.QuantizationTable table =
dqtSegment.quantizationTables
- .get(i);
+ final DqtSegment.QuantizationTable table =
dqtSegment.quantizationTables.get(i);
if (0 > table.destinationIdentifier
|| table.destinationIdentifier >=
quantizationTables.length) {
throw new ImageReadException(
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
Wed Sep 7 18:08:34 2016
@@ -523,8 +523,7 @@ public class ExifRewriter extends Binary
final byte[] markerLengthBytes =
ByteConversions.toBytes((short) markerLength, getByteOrder());
int index = 0;
- final JFIFPieceSegment firstSegment = (JFIFPieceSegment)
segments
- .get(index);
+ final JFIFPieceSegment firstSegment = (JFIFPieceSegment)
segments.get(index);
if (firstSegment.marker == JpegConstants.JFIF_MARKER) {
index = 1;
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -192,17 +192,14 @@ public class JpegIptcRewriter extends Jp
}
final List<JFIFPiece> newPieces =
removePhotoshopApp13Segments(oldPieces);
if (!removeSegment && photoshopApp13Segments.size() == 1) {
- final JFIFPieceSegment oldSegment = (JFIFPieceSegment)
photoshopApp13Segments
- .get(0);
+ final JFIFPieceSegment oldSegment = (JFIFPieceSegment)
photoshopApp13Segments.get(0);
final Map<String, Object> params = new HashMap<>();
- final PhotoshopApp13Data oldData = new IptcParser()
- .parsePhotoshopSegment(oldSegment.segmentData, params);
+ final PhotoshopApp13Data oldData = new
IptcParser().parsePhotoshopSegment(oldSegment.segmentData, params);
final List<IptcBlock> newBlocks = oldData.getNonIptcBlocks();
final List<IptcRecord> newRecords = new ArrayList<>();
final PhotoshopApp13Data newData = new
PhotoshopApp13Data(newRecords,
newBlocks);
- final byte[] segmentBytes = new IptcParser()
- .writePhotoshopApp13Segment(newData);
+ final byte[] segmentBytes = new
IptcParser().writePhotoshopApp13Segment(newData);
final JFIFPieceSegment newSegment = new JFIFPieceSegment(
oldSegment.marker, segmentBytes);
newPieces.add(oldPieces.indexOf(oldSegment), newSegment);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
Wed Sep 7 18:08:34 2016
@@ -137,8 +137,7 @@ class PcxWriter {
public void writeImage(final BufferedImage src, final OutputStream os)
throws ImageWriteException, IOException {
final PaletteFactory paletteFactory = new PaletteFactory();
- final SimplePalette palette = paletteFactory
- .makeExactRgbPaletteSimple(src, 256);
+ final SimplePalette palette =
paletteFactory.makeExactRgbPaletteSimple(src, 256);
final BinaryOutputStream bos = new BinaryOutputStream(os,
ByteOrder.LITTLE_ENDIAN);
if (palette == null || bitDepth == 24 || bitDepth == 32) {
@@ -175,8 +174,7 @@ class PcxWriter {
private void write32BppPCX(final BufferedImage src, final
BinaryOutputStream bos)
throws ImageWriteException, IOException {
- final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() : src
- .getWidth() + 1;
+ final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() :
src.getWidth() + 1;
// PCX header
bos.write(10); // manufacturer
@@ -187,8 +185,7 @@ class PcxWriter {
bos.write2Bytes(0); // yMin
bos.write2Bytes(src.getWidth() - 1); // xMax
bos.write2Bytes(src.getHeight() - 1); // yMax
- bos.write2Bytes((short) Math.round(pixelDensity
- .horizontalDensityInches())); // hDpi
+ bos.write2Bytes((short)
Math.round(pixelDensity.horizontalDensityInches())); // hDpi
bos.write2Bytes((short)
Math.round(pixelDensity.verticalDensityInches())); // vDpi
bos.write(new byte[48]); // 16 color palette
bos.write(0); // reserved
@@ -215,8 +212,7 @@ class PcxWriter {
private void write24BppPCX(final BufferedImage src, final
BinaryOutputStream bos)
throws ImageWriteException, IOException {
- final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() : src
- .getWidth() + 1;
+ final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() :
src.getWidth() + 1;
// PCX header
bos.write(10); // manufacturer
@@ -227,8 +223,7 @@ class PcxWriter {
bos.write2Bytes(0); // yMin
bos.write2Bytes(src.getWidth() - 1); // xMax
bos.write2Bytes(src.getHeight() - 1); // yMax
- bos.write2Bytes((short) Math.round(pixelDensity
- .horizontalDensityInches())); // hDpi
+ bos.write2Bytes((short)
Math.round(pixelDensity.horizontalDensityInches())); // hDpi
bos.write2Bytes((short)
Math.round(pixelDensity.verticalDensityInches())); // vDpi
bos.write(new byte[48]); // 16 color palette
bos.write(0); // reserved
@@ -270,8 +265,7 @@ class PcxWriter {
bos.write2Bytes(0); // yMin
bos.write2Bytes(src.getWidth() - 1); // xMax
bos.write2Bytes(src.getHeight() - 1); // yMax
- bos.write2Bytes((short) Math.round(pixelDensity
- .horizontalDensityInches())); // hDpi
+ bos.write2Bytes((short)
Math.round(pixelDensity.horizontalDensityInches())); // hDpi
bos.write2Bytes((short)
Math.round(pixelDensity.verticalDensityInches())); // vDpi
bos.write(new byte[48]); // 16 color palette
bos.write(0); // reserved
@@ -331,8 +325,7 @@ class PcxWriter {
bos.write2Bytes(0); // yMin
bos.write2Bytes(src.getWidth() - 1); // xMax
bos.write2Bytes(src.getHeight() - 1); // yMax
- bos.write2Bytes((short) Math.round(pixelDensity
- .horizontalDensityInches())); // hDpi
+ bos.write2Bytes((short)
Math.round(pixelDensity.horizontalDensityInches())); // hDpi
bos.write2Bytes((short)
Math.round(pixelDensity.verticalDensityInches())); // vDpi
bos.write(palette16); // 16 color palette
bos.write(0); // reserved
@@ -357,8 +350,7 @@ class PcxWriter {
private void write256ColorPCX(final BufferedImage src, final SimplePalette
palette,
final BinaryOutputStream bos) throws ImageWriteException,
IOException {
- final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() : src
- .getWidth() + 1;
+ final int bytesPerLine = src.getWidth() % 2 == 0 ? src.getWidth() :
src.getWidth() + 1;
// PCX header
bos.write(10); // manufacturer
@@ -369,8 +361,7 @@ class PcxWriter {
bos.write2Bytes(0); // yMin
bos.write2Bytes(src.getWidth() - 1); // xMax
bos.write2Bytes(src.getHeight() - 1); // yMax
- bos.write2Bytes((short) Math.round(pixelDensity
- .horizontalDensityInches())); // hDpi
+ bos.write2Bytes((short)
Math.round(pixelDensity.horizontalDensityInches())); // hDpi
bos.write2Bytes((short)
Math.round(pixelDensity.verticalDensityInches())); // vDpi
bos.write(new byte[48]); // 16 color palette
bos.write(0); // reserved
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -519,13 +519,11 @@ class PngWriter {
if (pixelDensityObj instanceof PixelDensity) {
final PixelDensity pixelDensity = (PixelDensity) pixelDensityObj;
if (pixelDensity.isUnitless()) {
- writeChunkPHYS(os, (int) Math.round(pixelDensity
- .getRawHorizontalDensity()),
+ writeChunkPHYS(os, (int)
Math.round(pixelDensity.getRawHorizontalDensity()),
(int) Math.round(pixelDensity.getRawVerticalDensity()),
(byte) 0);
} else {
- writeChunkPHYS(os, (int) Math.round(pixelDensity
- .horizontalDensityMetres()),
+ writeChunkPHYS(os, (int)
Math.round(pixelDensity.horizontalDensityMetres()),
(int) Math.round(pixelDensity.verticalDensityMetres()),
(byte) 1);
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
Wed Sep 7 18:08:34 2016
@@ -602,8 +602,8 @@ public class PsdImageParser extends Imag
// transfer_type = DataBuffer.TYPE_BYTE;
final boolean hasAlpha = false;
- final BufferedImage result = getBufferedImageFactory(params)
- .getColorBufferedImage(width, height, hasAlpha);
+ final BufferedImage result =
getBufferedImageFactory(params).getColorBufferedImage(
+ width, height, hasAlpha);
DataParser dataParser;
switch (imageContents.header.mode) {
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
Wed Sep 7 18:08:34 2016
@@ -108,8 +108,9 @@ public class RgbeImageParser extends Ima
ColorSpace.getInstance(ColorSpace.CS_sRGB), false, false,
Transparency.OPAQUE, buffer.getDataType()),
Raster.createWritableRaster(
- new BandedSampleModel(buffer.getDataType(), info
- .getWidth(), info.getHeight(), 3), buffer,
+ new BandedSampleModel(buffer.getDataType(),
+ info.getWidth(), info.getHeight(), 3),
+ buffer,
new Point()), false, null);
return ret;
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -207,8 +207,7 @@ public class TiffImageMetadata extends G
continue;
}
- final TiffOutputDirectory outputDirectory = srcDir
- .getOutputDirectory(byteOrder);
+ final TiffOutputDirectory outputDirectory =
srcDir.getOutputDirectory(byteOrder);
result.addDirectory(outputDirectory);
}
@@ -453,14 +452,10 @@ public class TiffImageMetadata extends G
}
// more specific example of how to access GPS values.
- final TiffField latitudeRefField = gpsDirectory
- .findField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);
- final TiffField latitudeField = gpsDirectory
- .findField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);
- final TiffField longitudeRefField = gpsDirectory
- .findField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);
- final TiffField longitudeField = gpsDirectory
- .findField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
+ final TiffField latitudeRefField =
gpsDirectory.findField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);
+ final TiffField latitudeField =
gpsDirectory.findField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);
+ final TiffField longitudeRefField =
gpsDirectory.findField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);
+ final TiffField longitudeField =
gpsDirectory.findField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
if (latitudeRefField == null || latitudeField == null
|| longitudeRefField == null || longitudeField == null) {
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -84,8 +84,8 @@ public class TiffImageParser extends Ima
public byte[] getICCProfileBytes(final ByteSource byteSource, final
Map<String, Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(isStrict(params))
- .readFirstDirectory(byteSource, params, false,
formatCompliance);
+ final TiffContents contents = new
TiffReader(isStrict(params)).readFirstDirectory(
+ byteSource, params, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
return
directory.getFieldValue(TiffEpTagConstants.EXIF_TAG_INTER_COLOR_PROFILE,
@@ -96,8 +96,8 @@ public class TiffImageParser extends Ima
public Dimension getImageSize(final ByteSource byteSource, final
Map<String, Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(isStrict(params))
- .readFirstDirectory(byteSource, params, false,
formatCompliance);
+ final TiffContents contents = new
TiffReader(isStrict(params)).readFirstDirectory(
+ byteSource, params, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
final TiffField widthField = directory.findField(
@@ -147,8 +147,8 @@ public class TiffImageParser extends Ima
public ImageInfo getImageInfo(final ByteSource byteSource, final
Map<String, Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(isStrict(params))
- .readDirectories(byteSource, false, formatCompliance);
+ final TiffContents contents = new
TiffReader(isStrict(params)).readDirectories(
+ byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
final TiffField widthField = directory.findField(
@@ -165,8 +165,8 @@ public class TiffImageParser extends Ima
// -------------------
- final TiffField resolutionUnitField = directory
- .findField(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT);
+ final TiffField resolutionUnitField = directory.findField(
+ TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT);
int resolutionUnit = 2; // Inch
if ((resolutionUnitField != null)
&& (resolutionUnitField.getValue() != null)) {
@@ -187,10 +187,10 @@ public class TiffImageParser extends Ima
break;
}
- final TiffField xResolutionField = directory
- .findField(TiffTagConstants.TIFF_TAG_XRESOLUTION);
- final TiffField yResolutionField = directory
- .findField(TiffTagConstants.TIFF_TAG_YRESOLUTION);
+ final TiffField xResolutionField = directory.findField(
+ TiffTagConstants.TIFF_TAG_XRESOLUTION);
+ final TiffField yResolutionField = directory.findField(
+ TiffTagConstants.TIFF_TAG_YRESOLUTION);
int physicalWidthDpi = -1;
float physicalWidthInch = -1;
@@ -200,26 +200,21 @@ public class TiffImageParser extends Ima
if (unitsPerInch > 0) {
if ((xResolutionField != null)
&& (xResolutionField.getValue() != null)) {
- final double xResolutionPixelsPerUnit = xResolutionField
- .getDoubleValue();
- physicalWidthDpi = (int) Math
- .round((xResolutionPixelsPerUnit * unitsPerInch));
+ final double xResolutionPixelsPerUnit =
xResolutionField.getDoubleValue();
+ physicalWidthDpi = (int) Math.round((xResolutionPixelsPerUnit
* unitsPerInch));
physicalWidthInch = (float) (width / (xResolutionPixelsPerUnit
* unitsPerInch));
}
if ((yResolutionField != null)
&& (yResolutionField.getValue() != null)) {
- final double yResolutionPixelsPerUnit = yResolutionField
- .getDoubleValue();
- physicalHeightDpi = (int) Math
- .round((yResolutionPixelsPerUnit * unitsPerInch));
+ final double yResolutionPixelsPerUnit =
yResolutionField.getDoubleValue();
+ physicalHeightDpi = (int) Math.round((yResolutionPixelsPerUnit
* unitsPerInch));
physicalHeightInch = (float) (height /
(yResolutionPixelsPerUnit * unitsPerInch));
}
}
// -------------------
- final TiffField bitsPerSampleField = directory
- .findField(TiffTagConstants.TIFF_TAG_BITS_PER_SAMPLE);
+ final TiffField bitsPerSampleField =
directory.findField(TiffTagConstants.TIFF_TAG_BITS_PER_SAMPLE);
int bitsPerSample = 1;
if ((bitsPerSampleField != null)
@@ -251,16 +246,14 @@ public class TiffImageParser extends Ima
final boolean transparent = false; // TODO: wrong
boolean usesPalette = false;
- final TiffField colorMapField = directory
- .findField(TiffTagConstants.TIFF_TAG_COLOR_MAP);
+ final TiffField colorMapField =
directory.findField(TiffTagConstants.TIFF_TAG_COLOR_MAP);
if (colorMapField != null) {
usesPalette = true;
}
final ImageInfo.ColorType colorType = ImageInfo.ColorType.RGB;
- final short[] compressionFieldValues = directory
- .getFieldValue(TiffTagConstants.TIFF_TAG_COMPRESSION, false);
+ final short[] compressionFieldValues =
directory.getFieldValue(TiffTagConstants.TIFF_TAG_COMPRESSION, false);
final short compressionFieldValue = compressionFieldValues != null ?
compressionFieldValues[0] : TIFF_COMPRESSION_UNCOMPRESSED_1;
final int compression = 0xffff & compressionFieldValue;
@@ -309,8 +302,8 @@ public class TiffImageParser extends Ima
public String getXmpXml(final ByteSource byteSource, final Map<String,
Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(isStrict(params))
- .readDirectories(byteSource, false, formatCompliance);
+ final TiffContents contents = new
TiffReader(isStrict(params)).readDirectories(
+ byteSource, false, formatCompliance);
final TiffDirectory directory = contents.directories.get(0);
final byte[] bytes =
directory.getFieldValue(TiffTagConstants.TIFF_TAG_XMP,
@@ -347,8 +340,7 @@ public class TiffImageParser extends Ima
// try
{
- final FormatCompliance formatCompliance = FormatCompliance
- .getDefault();
+ final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
final Map<String, Object> params = null;
final TiffContents contents = new
TiffReader(true).readContents(
byteSource, params, formatCompliance);
@@ -403,14 +395,13 @@ public class TiffImageParser extends Ima
public List<byte[]> collectRawImageData(final ByteSource byteSource, final
Map<String, Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
- final TiffContents contents = new TiffReader(isStrict(params))
- .readDirectories(byteSource, true, formatCompliance);
+ final TiffContents contents = new
TiffReader(isStrict(params)).readDirectories(
+ byteSource, true, formatCompliance);
final List<byte[]> result = new ArrayList<>();
for (int i = 0; i < contents.directories.size(); i++) {
final TiffDirectory directory = contents.directories.get(i);
- final List<ImageDataElement> dataElements = directory
- .getTiffRawImageDataElements();
+ final List<ImageDataElement> dataElements =
directory.getTiffRawImageDataElements();
for (ImageDataElement element : dataElements) {
final byte[] bytes = byteSource.getBlock(element.offset,
element.length);
@@ -555,8 +546,8 @@ public class TiffImageParser extends Ima
final int photometricInterpretation = 0xffff &
directory.getSingleFieldValue(
TiffTagConstants.TIFF_TAG_PHOTOMETRIC_INTERPRETATION);
- final short[] compressionFieldValues = directory
- .getFieldValue(TiffTagConstants.TIFF_TAG_COMPRESSION, false);
+ final short[] compressionFieldValues = directory.getFieldValue(
+ TiffTagConstants.TIFF_TAG_COMPRESSION, false);
final short compressionFieldValue = compressionFieldValues != null ?
compressionFieldValues[0] : TIFF_COMPRESSION_UNCOMPRESSED_1;
final int compression = 0xffff & compressionFieldValue;
@@ -675,8 +666,7 @@ public class TiffImageParser extends Ima
case 3: // Palette
{
final int[] colorMap = directory.findField(
- TiffTagConstants.TIFF_TAG_COLOR_MAP, true)
- .getIntArrayValue();
+ TiffTagConstants.TIFF_TAG_COLOR_MAP,
true).getIntArrayValue();
final int expectedColormapSize = 3 * (1 << bitsPerPixel);
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
Wed Sep 7 18:08:34 2016
@@ -299,8 +299,7 @@ public class TiffReader extends BinaryFi
public Collector(final Map<String, Object> params) {
boolean tmpReadThumbnails = true;
if (params != null &&
params.containsKey(ImagingConstants.PARAM_KEY_READ_THUMBNAILS)) {
- tmpReadThumbnails = Boolean.TRUE.equals(params
- .get(ImagingConstants.PARAM_KEY_READ_THUMBNAILS));
+ tmpReadThumbnails =
Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_READ_THUMBNAILS));
}
this.readThumbnails = tmpReadThumbnails;
}
@@ -422,8 +421,7 @@ public class TiffReader extends BinaryFi
private TiffImageData getTiffRawImageData(final ByteSource byteSource,
final TiffDirectory directory) throws ImageReadException,
IOException {
- final List<ImageDataElement> elements = directory
- .getTiffRawImageDataElements();
+ final List<ImageDataElement> elements =
directory.getTiffRawImageDataElements();
final TiffImageData.Data[] data = new
TiffImageData.Data[elements.size()];
if (byteSource instanceof ByteSourceFile) {
@@ -442,8 +440,7 @@ public class TiffReader extends BinaryFi
}
if (directory.imageDataInStrips()) {
- final TiffField rowsPerStripField = directory
- .findField(TiffTagConstants.TIFF_TAG_ROWS_PER_STRIP);
+ final TiffField rowsPerStripField =
directory.findField(TiffTagConstants.TIFF_TAG_ROWS_PER_STRIP);
/*
* Default value of rowsperstrip is assumed to be infinity
*
http://www.awaresystems.be/imaging/tiff/tifftags/rowsperstrip.html
@@ -453,8 +450,7 @@ public class TiffReader extends BinaryFi
if (null != rowsPerStripField) {
rowsPerStrip = rowsPerStripField.getIntValue();
} else {
- final TiffField imageHeight = directory
- .findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
+ final TiffField imageHeight =
directory.findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
/**
* if rows per strip not present then rowsPerStrip is equal to
* imageLength or an infinity value;
@@ -467,15 +463,13 @@ public class TiffReader extends BinaryFi
return new TiffImageData.Strips(data, rowsPerStrip);
} else {
- final TiffField tileWidthField = directory
- .findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
+ final TiffField tileWidthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_WIDTH);
if (null == tileWidthField) {
throw new ImageReadException("Can't find tile width field.");
}
final int tileWidth = tileWidthField.getIntValue();
- final TiffField tileLengthField = directory
- .findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
+ final TiffField tileLengthField =
directory.findField(TiffTagConstants.TIFF_TAG_TILE_LENGTH);
if (null == tileLengthField) {
throw new ImageReadException("Can't find tile length field.");
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
Wed Sep 7 18:08:34 2016
@@ -123,8 +123,7 @@ class BitInputStream extends InputStream
if (count == 32) {
bytesRead += 4;
- return ((is.read() << 0) | (is.read() << 8) | (is.read() <<
16) | (is
- .read() << 24));
+ return ((is.read() << 0) | (is.read() << 8) | (is.read() <<
16) | (is.read() << 24));
}
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -140,8 +140,7 @@ public abstract class DataReader {
protected byte[] decompress(final byte[] compressed, final int compression,
final int expectedSize, final int tileWidth, final int tileHeight)
throws ImageReadException, IOException {
- final TiffField fillOrderField = directory
- .findField(TiffTagConstants.TIFF_TAG_FILL_ORDER);
+ final TiffField fillOrderField =
directory.findField(TiffTagConstants.TIFF_TAG_FILL_ORDER);
int fillOrder = TiffTagConstants.FILL_ORDER_VALUE_NORMAL;
if (fillOrderField != null) {
fillOrder = fillOrderField.getIntValue();
@@ -166,8 +165,7 @@ public abstract class DataReader {
tileWidth, tileHeight);
case TIFF_COMPRESSION_CCITT_GROUP_3: {
int t4Options = 0;
- final TiffField field = directory
- .findField(TiffTagConstants.TIFF_TAG_T4_OPTIONS);
+ final TiffField field =
directory.findField(TiffTagConstants.TIFF_TAG_T4_OPTIONS);
if (field != null) {
t4Options = field.getIntValue();
}
@@ -187,8 +185,7 @@ public abstract class DataReader {
}
case TIFF_COMPRESSION_CCITT_GROUP_4: {
int t6Options = 0;
- final TiffField field = directory
- .findField(TiffTagConstants.TIFF_TAG_T6_OPTIONS);
+ final TiffField field =
directory.findField(TiffTagConstants.TIFF_TAG_T6_OPTIONS);
if (field != null) {
t6Options = field.getIntValue();
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -180,8 +180,8 @@ public abstract class TiffImageWriterBas
previousDirectory = directory;
}
- final TiffOutputDirectory rootDirectory = directoryTypeMap
- .get(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT);
+ final TiffOutputDirectory rootDirectory = directoryTypeMap.get(
+ TiffDirectoryConstants.DIRECTORY_TYPE_ROOT);
// prepare results
final TiffOutputSummary result = new TiffOutputSummary(byteOrder,
@@ -264,8 +264,8 @@ public abstract class TiffImageWriterBas
params.remove(ImagingConstants.PARAM_KEY_XMP_XML);
}
- PixelDensity pixelDensity = (PixelDensity) params
- .remove(ImagingConstants.PARAM_KEY_PIXEL_DENSITY);
+ PixelDensity pixelDensity = (PixelDensity) params.remove(
+ ImagingConstants.PARAM_KEY_PIXEL_DENSITY);
if (pixelDensity == null) {
pixelDensity = PixelDensity.createFromPixelsPerInch(72, 72);
}
@@ -499,8 +499,7 @@ public abstract class TiffImageWriterBas
private void combineUserExifIntoFinalExif(final TiffOutputSet userExif,
final TiffOutputSet outputSet) throws ImageWriteException {
- final List<TiffOutputDirectory> outputDirectories = outputSet
- .getDirectories();
+ final List<TiffOutputDirectory> outputDirectories =
outputSet.getDirectories();
Collections.sort(outputDirectories, TiffOutputDirectory.COMPARATOR);
for (final TiffOutputDirectory userDirectory :
userExif.getDirectories()) {
final int location = Collections.binarySearch(outputDirectories,
@@ -508,8 +507,7 @@ public abstract class TiffImageWriterBas
if (location < 0) {
outputSet.addDirectory(userDirectory);
} else {
- final TiffOutputDirectory outputDirectory = outputDirectories
- .get(location);
+ final TiffOutputDirectory outputDirectory =
outputDirectories.get(location);
for (final TiffOutputField userField :
userDirectory.getFields()) {
if (outputDirectory.findField(userField.tagInfo) == null) {
outputDirectory.add(userField);
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -41,8 +41,7 @@ public class TiffImageWriterLossy extend
throws IOException, ImageWriteException {
final TiffOutputSummary outputSummary = validateDirectories(outputSet);
- final List<TiffOutputItem> outputItems = outputSet
- .getOutputItems(outputSummary);
+ final List<TiffOutputItem> outputItems =
outputSet.getOutputItems(outputSummary);
updateOffsetsStep(outputItems);
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -165,8 +165,7 @@ public final class TiffOutputSet {
final double longitudeSeconds = value;
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
- gpsDirectory
- .add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,
+ gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,
RationalNumber.valueOf(longitudeDegrees),
RationalNumber.valueOf(longitudeMinutes),
RationalNumber.valueOf(longitudeSeconds));
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -69,8 +69,8 @@ class TiffOutputSummary {
imageDataInfo.imageDataOffsets[j] = (int) item.getOffset();
}
- imageDataInfo.imageDataOffsetsField.setData(FieldType.LONG
- .writeData(imageDataInfo.imageDataOffsets, byteOrder));
+ imageDataInfo.imageDataOffsetsField.setData(
+ FieldType.LONG.writeData(imageDataInfo.imageDataOffsets,
byteOrder));
}
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -296,13 +296,11 @@ public class XbmImageParser extends Imag
long bits = uuid.getMostSignificantBits();
// Long.toHexString() breaks for very big numbers
for (int i = 64 - 8; i >= 0; i -= 8) {
- stringBuilder.append(Integer
- .toHexString((int) ((bits >> i) & 0xff)));
+ stringBuilder.append(Integer.toHexString((int) ((bits >> i) &
0xff)));
}
bits = uuid.getLeastSignificantBits();
for (int i = 64 - 8; i >= 0; i -= 8) {
- stringBuilder.append(Integer
- .toHexString((int) ((bits >> i) & 0xff)));
+ stringBuilder.append(Integer.toHexString((int) ((bits >> i) &
0xff)));
}
return stringBuilder.toString();
}
@@ -333,12 +331,9 @@ public class XbmImageParser extends Imag
final String name = randomName();
- os.write(("#define " + name + "_width " + src.getWidth() + "\n")
- .getBytes("US-ASCII"));
- os.write(("#define " + name + "_height " + src.getHeight() + "\n")
- .getBytes("US-ASCII"));
- os.write(("static unsigned char " + name + "_bits[] = {")
- .getBytes("US-ASCII"));
+ os.write(("#define " + name + "_width " + src.getWidth() +
"\n").getBytes("US-ASCII"));
+ os.write(("#define " + name + "_height " + src.getHeight() +
"\n").getBytes("US-ASCII"));
+ os.write(("static unsigned char " + name + "_bits[] =
{").getBytes("US-ASCII"));
int bitcache = 0;
int bitsInCache = 0;
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -138,19 +138,18 @@ public class XpmImageParser extends Imag
final XpmHeader xpmHeader = readXpmHeader(byteSource);
boolean transparent = false;
ImageInfo.ColorType colorType = ImageInfo.ColorType.BW;
- for (final Entry<Object, PaletteEntry> entry : xpmHeader.palette
- .entrySet()) {
- final PaletteEntry paletteEntry = entry.getValue();
- if ((paletteEntry.getBestARGB() & 0xff000000) != 0xff000000) {
- transparent = true;
- }
- if (paletteEntry.haveColor) {
- colorType = ImageInfo.ColorType.RGB;
- } else if (colorType != ImageInfo.ColorType.RGB
- && (paletteEntry.haveGray || paletteEntry.haveGray4Level)) {
- colorType = ImageInfo.ColorType.GRAYSCALE;
- }
- }
+ for (final Entry<Object, PaletteEntry> entry :
xpmHeader.palette.entrySet()) {
+ final PaletteEntry paletteEntry = entry.getValue();
+ if ((paletteEntry.getBestARGB() & 0xff000000) != 0xff000000) {
+ transparent = true;
+ }
+ if (paletteEntry.haveColor) {
+ colorType = ImageInfo.ColorType.RGB;
+ } else if (colorType != ImageInfo.ColorType.RGB
+ && (paletteEntry.haveGray || paletteEntry.haveGray4Level))
{
+ colorType = ImageInfo.ColorType.GRAYSCALE;
+ }
+ }
return new ImageInfo("XPM version 3", xpmHeader.numCharsPerPixel * 8,
new ArrayList<String>(), ImageFormats.XPM,
"X PixMap", xpmHeader.height, "image/x-xpixmap", 1, 0, 0, 0, 0,
@@ -272,8 +271,7 @@ public class XpmImageParser extends Imag
+ "no string found where expected");
}
BasicCParser.unescapeString(stringBuilder, token);
- for (token = cParser.nextToken(); token.charAt(0) == '"'; token =
cParser
- .nextToken()) {
+ for (token = cParser.nextToken(); token.charAt(0) == '"'; token =
cParser.nextToken()) {
BasicCParser.unescapeString(stringBuilder, token);
}
if (",".equals(token)) {
@@ -507,8 +505,7 @@ public class XpmImageParser extends Imag
int bpp;
if (xpmHeader.palette.size() <= (1 << 8)) {
final int[] palette = new int[xpmHeader.palette.size()];
- for (final Entry<Object, PaletteEntry> entry : xpmHeader.palette
- .entrySet()) {
+ for (final Entry<Object, PaletteEntry> entry :
xpmHeader.palette.entrySet()) {
final PaletteEntry paletteEntry = entry.getValue();
palette[paletteEntry.index] = paletteEntry.getBestARGB();
}
@@ -520,8 +517,7 @@ public class XpmImageParser extends Imag
bpp = 8;
} else if (xpmHeader.palette.size() <= (1 << 16)) {
final int[] palette = new int[xpmHeader.palette.size()];
- for (final Entry<Object, PaletteEntry> entry : xpmHeader.palette
- .entrySet()) {
+ for (final Entry<Object, PaletteEntry> entry :
xpmHeader.palette.entrySet()) {
final PaletteEntry paletteEntry = entry.getValue();
palette[paletteEntry.index] = paletteEntry.getBestARGB();
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -105,8 +105,7 @@ class ColorSpaceSubset {
System.out.println("\t" + "red: " + mins[0] + ", " + maxs[0] + ", "
+ "green: " + mins[1] + ", " + maxs[1] + ", " + "blue: "
+ mins[2] + ", " + maxs[2]);
- System.out
- .println("\t" + "rdiff: " + rdiff + ", " + "gdiff: " + gdiff
+ System.out.println("\t" + "rdiff: " + rdiff + ", " + "gdiff: " + gdiff
+ ", " + "bdiff: " + bdiff + ", " + "colorArea: "
+ colorArea);
}
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -432,8 +432,7 @@ public class PaletteFactory {
final int width = src.getWidth();
final int height = src.getHeight();
- if (ColorSpace.TYPE_GRAY == src.getColorModel().getColorSpace()
- .getType()) {
+ if (ColorSpace.TYPE_GRAY ==
src.getColorModel().getColorSpace().getType()) {
return true;
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
Wed Sep 7 18:08:34 2016
@@ -136,7 +136,7 @@ public abstract class ImagingTest implem
}
protected boolean isInvalidPNGTestFile(final File file) {
- return (file.getParentFile().getName().equalsIgnoreCase("pngsuite") &&
file
- .getName().toLowerCase().startsWith("x"));
+ return (file.getParentFile().getName().equalsIgnoreCase("pngsuite") &&
+ file.getName().toLowerCase().startsWith("x"));
}
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
Wed Sep 7 18:08:34 2016
@@ -24,8 +24,8 @@ import org.apache.commons.io.FilenameUti
public interface ImagingTestConstants {
static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
- FilenameUtils
-
.separatorsToSystem("src\\test\\data\\images\\exif\\philHarvey\\"));
+ FilenameUtils.separatorsToSystem(
+ "src\\test\\data\\images\\exif\\philHarvey\\"));
static final File SOURCE_FOLDER = new File("src");
static final File TEST_SOURCE_FOLDER = new File(SOURCE_FOLDER, "test");
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
Wed Sep 7 18:08:34 2016
@@ -104,8 +104,7 @@ public class ColorConversionsTest {
assertEquals((0xffffff & hunterlab_xyz_rgb), (0xffffff & rgb));
final ColorCieLch cielch =
ColorConversions.convertCIELabtoCIELCH(cielab);
- final ColorCieLab cielch_cielab = ColorConversions
- .convertCIELCHtoCIELab(cielch);
+ final ColorCieLab cielch_cielab =
ColorConversions.convertCIELCHtoCIELab(cielch);
Debug.debug("cielch", cielch);
Debug.debug("cielch_cielab", cielch_cielab);
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=1759654&r1=1759653&r2=1759654&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
Wed Sep 7 18:08:34 2016
@@ -84,16 +84,14 @@ public class ByteSourceImageTest extends
checkGuessFormat(imageFile, imageFileBytes);
if (imageFile.getName().toLowerCase().endsWith(".png")
- && imageFile.getParentFile().getName()
- .equalsIgnoreCase("pngsuite")
+ &&
imageFile.getParentFile().getName().equalsIgnoreCase("pngsuite")
&& imageFile.getName().toLowerCase().startsWith("x")) {
return;
}
checkGetICCProfileBytes(imageFile, imageFileBytes);
- if (!imageFile.getParentFile().getName().toLowerCase()
- .equals("@broken")) {
+ if
(!imageFile.getParentFile().getName().toLowerCase().equals("@broken")) {
checkGetImageInfo(imageFile, imageFileBytes);
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
Wed Sep 7 18:08:34 2016
@@ -51,8 +51,7 @@ public class ImageReadExample {
@Override
public BufferedImage getColorBufferedImage(final int width, final int
height,
final boolean hasAlpha) {
- final GraphicsEnvironment ge = GraphicsEnvironment
- .getLocalGraphicsEnvironment();
+ final GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
final GraphicsDevice gd = ge.getDefaultScreenDevice();
final GraphicsConfiguration gc = gd.getDefaultConfiguration();
return gc.createCompatibleImage(width, height,
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
Wed Sep 7 18:08:34 2016
@@ -94,25 +94,22 @@ public class MetadataExample {
}
// more specific example of how to manually access GPS values
- final TiffField gpsLatitudeRefField = jpegMetadata
-
.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);
- final TiffField gpsLatitudeField = jpegMetadata
-
.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LATITUDE);
- final TiffField gpsLongitudeRefField = jpegMetadata
-
.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);
- final TiffField gpsLongitudeField = jpegMetadata
-
.findEXIFValueWithExactMatch(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
- if (gpsLatitudeRefField != null && gpsLatitudeField != null
- && gpsLongitudeRefField != null
- && gpsLongitudeField != null) {
+ final TiffField gpsLatitudeRefField =
jpegMetadata.findEXIFValueWithExactMatch(
+ GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);
+ final TiffField gpsLatitudeField =
jpegMetadata.findEXIFValueWithExactMatch(
+ GpsTagConstants.GPS_TAG_GPS_LATITUDE);
+ final TiffField gpsLongitudeRefField =
jpegMetadata.findEXIFValueWithExactMatch(
+ GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);
+ final TiffField gpsLongitudeField =
jpegMetadata.findEXIFValueWithExactMatch(
+ GpsTagConstants.GPS_TAG_GPS_LONGITUDE);
+ if (gpsLatitudeRefField != null && gpsLatitudeField != null &&
+ gpsLongitudeRefField != null &&
+ gpsLongitudeField != null) {
// all of these values are strings.
final String gpsLatitudeRef = (String)
gpsLatitudeRefField.getValue();
- final RationalNumber gpsLatitude[] = (RationalNumber[])
(gpsLatitudeField
- .getValue());
- final String gpsLongitudeRef = (String) gpsLongitudeRefField
- .getValue();
- final RationalNumber gpsLongitude[] = (RationalNumber[])
gpsLongitudeField
- .getValue();
+ final RationalNumber gpsLatitude[] = (RationalNumber[])
(gpsLatitudeField.getValue());
+ final String gpsLongitudeRef = (String)
gpsLongitudeRefField.getValue();
+ final RationalNumber gpsLongitude[] = (RationalNumber[])
gpsLongitudeField.getValue();
final RationalNumber gpsLatitudeDegrees = gpsLatitude[0];
final RationalNumber gpsLatitudeMinutes = gpsLatitude[1];
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
Wed Sep 7 18:08:34 2016
@@ -104,8 +104,7 @@ public class SampleUsage {
Imaging.dumpImageFile(imageBytes);
// <b>get a summary of format errors. </b>
- final FormatCompliance formatCompliance = Imaging
- .getFormatCompliance(imageBytes);
+ final FormatCompliance formatCompliance =
Imaging.getFormatCompliance(imageBytes);
} catch (final Exception e) {
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
Wed Sep 7 18:08:34 2016
@@ -104,12 +104,10 @@ public class WriteExifMetadataExample {
// TagInfo constants often contain a description of what
// directories are associated with a given tag.
//
- final TiffOutputDirectory exifDirectory = outputSet
- .getOrCreateExifDirectory();
+ final TiffOutputDirectory exifDirectory =
outputSet.getOrCreateExifDirectory();
// make sure to remove old value if present (this method will
// not fail if the tag does not exist).
- exifDirectory
- .removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE);
+
exifDirectory.removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE);
exifDirectory.add(ExifTagConstants.EXIF_TAG_APERTURE_VALUE,
new RationalNumber(3, 10));
}
@@ -198,11 +196,9 @@ public class WriteExifMetadataExample {
// To learn which directory a tag appears in, either refer to
// the constants in ExifTagConstants.java or go to Phil
Harvey's
// EXIF website.
- final TiffOutputDirectory exifDirectory = outputSet
- .getExifDirectory();
+ final TiffOutputDirectory exifDirectory =
outputSet.getExifDirectory();
if (null != exifDirectory) {
- exifDirectory
-
.removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE);
+
exifDirectory.removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE);
}
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
Wed Sep 7 18:08:34 2016
@@ -76,8 +76,7 @@ public class ExifRewriteTest extends Exi
new JpegUtils().dumpJFIF(byteSource);
{
- final JpegImageMetadata metadata = (JpegImageMetadata) Imaging
- .getMetadata(imageFile);
+ final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile);
Assert.assertNotNull(metadata);
}
@@ -114,8 +113,7 @@ public class ExifRewriteTest extends Exi
Debug.debug("Source Segments:");
new JpegUtils().dumpJFIF(byteSource);
- final JpegImageMetadata originalMetadata = (JpegImageMetadata)
Imaging
- .getMetadata(imageFile);
+ final JpegImageMetadata originalMetadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile);
assertNotNull(originalMetadata);
final TiffImageMetadata oldExifMetadata =
originalMetadata.getExif();
@@ -156,8 +154,7 @@ public class ExifRewriteTest extends Exi
// assertTrue(!hasExifData(tempFile));
- final JpegImageMetadata newMetadata = (JpegImageMetadata)
Imaging
- .getMetadata(tempFile);
+ final JpegImageMetadata newMetadata = (JpegImageMetadata)
Imaging.getMetadata(tempFile);
assertNotNull(newMetadata);
final TiffImageMetadata newExifMetadata =
newMetadata.getExif();
assertNotNull(newExifMetadata);
@@ -195,8 +192,7 @@ public class ExifRewriteTest extends Exi
Debug.debug("Source Segments:");
new JpegUtils().dumpJFIF(byteSource);
- final JpegImageMetadata oldMetadata = (JpegImageMetadata)
Imaging
- .getMetadata(imageFile);
+ final JpegImageMetadata oldMetadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile);
if (null == oldMetadata) {
continue;
}
@@ -227,8 +223,7 @@ public class ExifRewriteTest extends Exi
// assertTrue(!hasExifData(tempFile));
- final JpegImageMetadata newMetadata = (JpegImageMetadata)
Imaging
- .getMetadata(tempFile);
+ final JpegImageMetadata newMetadata = (JpegImageMetadata)
Imaging.getMetadata(tempFile);
assertNotNull(newMetadata);
final TiffImageMetadata newExifMetadata =
newMetadata.getExif();
assertNotNull(newExifMetadata);
@@ -284,8 +279,7 @@ public class ExifRewriteTest extends Exi
private Map<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final
List<? extends ImageMetadataItem> directories) {
final Map<Integer,TiffImageMetadata.Directory> directoryMap = new
HashMap<>();
for (int i = 0; i < directories.size(); i++) {
- final TiffImageMetadata.Directory directory =
(TiffImageMetadata.Directory) directories
- .get(i);
+ final TiffImageMetadata.Directory directory =
(TiffImageMetadata.Directory) directories.get(i);
directoryMap.put(directory.type, directory);
}
return directoryMap;
@@ -328,10 +322,8 @@ public class ExifRewriteTest extends Exi
// Debug.debug("dirType", dirType);
- final TiffImageMetadata.Directory oldDirectory = oldDirectoryMap
- .get(dirType);
- final TiffImageMetadata.Directory newDirectory = newDirectoryMap
- .get(dirType);
+ final TiffImageMetadata.Directory oldDirectory =
oldDirectoryMap.get(dirType);
+ final TiffImageMetadata.Directory newDirectory =
newDirectoryMap.get(dirType);
assertNotNull(oldDirectory);
assertNotNull(newDirectory);
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
Wed Sep 7 18:08:34 2016
@@ -47,8 +47,7 @@ public class GpsTest extends ExifBaseTes
@Test
public void test() throws Exception {
- if (imageFile.getParentFile().getName().toLowerCase()
- .equals("@broken")) {
+ if
(imageFile.getParentFile().getName().toLowerCase().equals("@broken")) {
return;
}
@@ -56,8 +55,7 @@ public class GpsTest extends ExifBaseTes
final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS,
Boolean.valueOf(!ignoreImageData));
- final JpegImageMetadata metadata = (JpegImageMetadata) Imaging
- .getMetadata(imageFile, params);
+ final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile, params);
if (null == metadata) {
return;
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1759654&r1=1759653&r2=1759654&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
Wed Sep 7 18:08:34 2016
@@ -52,8 +52,7 @@ public abstract class SpecificExifTagTes
@Test
public void testAllImages() throws Exception {
- if (imageFile.getParentFile().getName().toLowerCase()
- .equals("@broken")) {
+ if
(imageFile.getParentFile().getName().toLowerCase().equals("@broken")) {
return;
}
checkImage(imageFile);
