You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2018/08/25 10:40:51 UTC
[04/14] commons-imaging git commit: IMAGING-103: for checkstyle,
remove trailing space
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
index 3ebf877..9df8b30 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
@@ -198,7 +198,7 @@ public class PsdImageParser extends ImageParser {
"Not a Valid PSD File");
available -= nameLength;
if (((nameLength + 1) % 2) != 0) {
- //final int NameDiscard =
+ //final int NameDiscard =
readByte("NameDiscard", is,
"Not a Valid PSD File");
available -= 1;
@@ -660,7 +660,7 @@ public class PsdImageParser extends ImageParser {
throw new ImageReadException("Unknown Compression: "
+ imageContents.Compression);
}
-
+
try (InputStream is = getInputStream(byteSource, PSD_SECTION_IMAGE_DATA)) {
fDataReader.readData(is, result, imageContents, this);
@@ -676,7 +676,7 @@ public class PsdImageParser extends ImageParser {
/**
* Extracts embedded XML metadata as XML string.
* <p>
- *
+ *
* @param byteSource
* File containing image data.
* @param params
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
index 4b2d9e3..28f188c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
@@ -55,12 +55,12 @@ public class UncompressedDataReader implements DataReader {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
final int b = bbis.readBits(depth);
-
+
data[channel][y][x] = (byte) b;
}
}
}
-
+
dataParser.parseData(data, bi, imageContents);
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
index 93b61d3..3463bb6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
@@ -41,7 +41,7 @@ import org.apache.commons.imaging.common.bytesource.ByteSource;
/**
* Parser for Radiance HDR images
- *
+ *
* @author <a href="mailto:peter@electrotank.com">peter royal</a>
*/
public class RgbeImageParser extends ImageParser {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
index 691e430..18ddff7 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
@@ -73,7 +73,7 @@ public class TiffDirectory extends TiffElement {
this.entries = Collections.unmodifiableList(entries);
this.nextDirectoryOffset = nextDirectoryOffset;
}
-
+
public String description() {
return TiffDirectory.description(type);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
index 40d75a6..43bcc69 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
@@ -66,23 +66,23 @@ public class TiffField {
tagInfo = TiffTags.getTag(directoryType, tag);
}
-
+
public int getDirectoryType() {
return directoryType;
}
-
+
public TagInfo getTagInfo() {
return tagInfo;
}
/**
* Returns the field's tag, derived from bytes 0-1.
- * @return the tag, as an <code>int</code> in which only the lowest 2 bytes are set
+ * @return the tag, as an <code>int</code> in which only the lowest 2 bytes are set
*/
public int getTag() {
return tag;
}
-
+
/**
* Returns the field's type, derived from bytes 2-3.
* @return the field's type, as a {@code FieldType} object.
@@ -137,7 +137,7 @@ public class TiffField {
}
/**
- * Returns a copy of the raw value of the field.
+ * Returns a copy of the raw value of the field.
* @return the value of the field, in the byte order of the field.
*/
public byte[] getByteArrayValue() {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
index 52d23fb..7193111 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
@@ -61,8 +61,8 @@ public abstract class TiffImageData {
predictor, samplesPerPixel, width, height, compression,
byteOrder, this);
}
-
- /**
+
+ /**
* Get the width of individual tiles. Note that if the overall
* image width is not a multiple of the tile width, then
* the last column of tiles may extend beyond the image width.
@@ -71,8 +71,8 @@ public abstract class TiffImageData {
public int getTileWidth() {
return tileWidth;
}
-
- /**
+
+ /**
* Get the height of individual tiles. Note that if the overall
* image height is not a multiple of the tile height, then
* the last row of tiles may extend beyond the image height.
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index fd482c2..7235f2e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -420,7 +420,7 @@ public class TiffImageParser extends ImageParser {
* The TIFF parser includes support for loading partial images without
* committing significantly more memory resources than are necessary
* to store the image. This feature is useful for conserving memory
- * in applications that require a relatively small sub image from a
+ * in applications that require a relatively small sub image from a
* very large TIFF file. The specifications for partial images are
* as follows:
* <code><pre>
@@ -431,14 +431,14 @@ public class TiffImageParser extends ImageParser {
* params.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, new Integer(height));
* </pre></code>
* Note that the arguments x, y, width, and height must specify a
- * valid rectangular region that is fully contained within the
+ * valid rectangular region that is fully contained within the
* source TIFF image.
* @param byteSource A valid instance of ByteSource
- * @param params Optional instructions for special-handling or
- * interpretation of the input data (null objects are permitted and
+ * @param params Optional instructions for special-handling or
+ * interpretation of the input data (null objects are permitted and
* must be supported by implementations).
* @return A valid instance of BufferedImage.
- * @throws ImageReadException In the event that the specified
+ * @throws ImageReadException In the event that the specified
* content does not conform to the format of the specific parser
* implementation.
* @throws IOException In the event of unsuccessful read or
@@ -498,7 +498,7 @@ public class TiffImageParser extends ImageParser {
}
throw new ImageReadException("Non-Integer parameter " + key);
}
-
+
private Rectangle checkForSubImage(
final Map<String, Object> params)
throws ImageReadException
@@ -507,7 +507,7 @@ public class TiffImageParser extends ImageParser {
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;
}
@@ -529,12 +529,12 @@ public class TiffImageParser extends ImageParser {
sb.setLength(sb.length() - 1);
throw new ImageReadException("Incomplete subimage parameters, missing" + sb.toString());
}
-
+
return new Rectangle(ix0, iy0, iwidth, iheight);
}
-
+
protected BufferedImage getBufferedImage(final TiffDirectory directory,
- final ByteOrder byteOrder, final Map<String, Object> params)
+ final ByteOrder byteOrder, final Map<String, Object> params)
throws ImageReadException, IOException
{
final List<TiffField> entries = directory.entries;
@@ -553,8 +553,8 @@ public class TiffImageParser extends ImageParser {
}
final int compression = 0xffff & compressionFieldValue;
final int width = directory.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_WIDTH);
- final int height = directory.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
-
+ final int height = directory.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
+
Rectangle subImage = checkForSubImage(params);
if (subImage != null) {
// Check for valid subimage specification. The following checks
@@ -588,7 +588,7 @@ public class TiffImageParser extends ImageParser {
}
}
-
+
int samplesPerPixel = 1;
final TiffField samplesPerPixelField = directory.findField(
TiffTagConstants.TIFF_TAG_SAMPLES_PER_PIXEL);
@@ -649,7 +649,7 @@ public class TiffImageParser extends ImageParser {
dataReader.readImageData(imageBuilder);
result = imageBuilder.getBufferedImage();
}
- return result;
+ return result;
}
private PhotometricInterpreter getPhotometricInterpreter(
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
index 55be211..6150645 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
@@ -58,7 +58,7 @@ public class TiffReader extends BinaryFileParser {
return readTiffHeader(is);
}
}
-
+
private ByteOrder getTiffByteOrder(final int byteOrderByte) throws ImageReadException {
if (byteOrderByte == 'I') {
return ByteOrder.LITTLE_ENDIAN; // Intel
@@ -84,7 +84,7 @@ public class TiffReader extends BinaryFileParser {
throw new ImageReadException("Unknown Tiff Version: " + tiffVersion);
}
- final long offsetToFirstIFD =
+ final long offsetToFirstIFD =
0xFFFFffffL & read4Bytes("offsetToFirstIFD", is, "Not a Valid TIFF File", getByteOrder());
skipBytes(is, offsetToFirstIFD - 8, "Not a Valid TIFF File: couldn't find IFDs");
@@ -158,7 +158,7 @@ public class TiffReader extends BinaryFileParser {
// which can cause OOM problems.
continue;
}
-
+
final FieldType fieldType;
try {
fieldType = FieldType.getFieldType(type);
@@ -245,7 +245,7 @@ public class TiffReader extends BinaryFileParser {
subDirectoryRead = readDirectory(byteSource,
subDirectoryOffset, subDirectoryType,
formatCompliance, listener, true, visited);
-
+
} catch (final ImageReadException imageReadException) {
if (strict) {
throw imageReadException;
@@ -452,7 +452,7 @@ public class TiffReader extends BinaryFileParser {
if (imageHeight != null) {
rowsPerStrip = imageHeight.getIntValue();
}
-
+
}
return new TiffImageData.Strips(data, rowsPerStrip);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
index fbf95b0..076031a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
@@ -77,7 +77,7 @@ final class TiffTags {
return Collections.unmodifiableList(result);
}
-
+
private static Map<Integer, List<TagInfo>> makeTagMap(
final List<TagInfo> tags) {
// make sure to use the thread-safe version; this is shared state.
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java
index d905b64..3cef4c9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShort;
* http://partners.adobe.com/public/developer/en/tiff/TIFFPM6.pdf
*/
public final class AdobePageMaker6TagConstants {
-
+
public static final TagInfoLongOrIFD TIFF_TAG_SUB_IFD = new TagInfoLongOrIFD(
"SubIFDs", 0x014a, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true);
@@ -78,7 +78,7 @@ public final class AdobePageMaker6TagConstants {
TIFF_TAG_INDEXED,
TIFF_TAG_OPIPROXY,
TIFF_TAG_IMAGE_ID));
-
+
private AdobePageMaker6TagConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
index d5f45a2..a3aab61 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
@@ -45,7 +45,7 @@ public final class AdobePhotoshopTagConstants {
EXIF_TAG_JPEGTABLES,
EXIF_TAG_IMAGE_SOURCE_DATA
));
-
+
private AdobePhotoshopTagConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.java
index 947c461..0052cdc 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AliasSketchbookProTagConstants.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoAscii;
* http://www.awaresystems.be/imaging/tiff/tifftags/docs/alias.html
*/
public final class AliasSketchbookProTagConstants {
-
+
public static final TagInfoAscii EXIF_TAG_ALIAS_LAYER_METADATA = new TagInfoAscii(
"Alias Layer Metadata", 0xc660, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -37,7 +37,7 @@ public final class AliasSketchbookProTagConstants {
public static final List<TagInfo> ALL_ALIAS_SKETCHBOOK_PRO_TAGS =
Collections.unmodifiableList(Arrays.<TagInfo> asList(
EXIF_TAG_ALIAS_LAYER_METADATA));
-
+
private AliasSketchbookProTagConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
index 3d0fb5d..16c85e5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
@@ -45,7 +45,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoUnknowns;
* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html
* http://tiki-lounge.com/~raf/tiff/fields.html
* http://www.awaresystems.be/imaging/tiff/tifftags.html
- *
+ *
* "Stonits": http://www.anyhere.com/gward/pixformat/tiffluv.html
*/
public final class ExifTagConstants {
@@ -644,9 +644,9 @@ public final class ExifTagConstants {
EXIF_TAG_SHADOWS, EXIF_TAG_BRIGHTNESS, EXIF_TAG_CONTRAST_2,
EXIF_TAG_SATURATION_2, EXIF_TAG_SHARPNESS_2, EXIF_TAG_SMOOTHNESS,
EXIF_TAG_MOIRE_FILTER,
-
+
EXIF_TAG_USER_COMMENT, //
-
+
EXIF_TAG_MAKER_NOTE));
private ExifTagConstants() {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java
index 96a4d0b..541514c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoAscii;
* http://www.awaresystems.be/imaging/tiff/tifftags/gdal_nodata.html
*/
public final class GdalLibraryTagConstants {
-
+
public static final TagInfoAscii EXIF_TAG_GDAL_METADATA = new TagInfoAscii(
"GDALMetadata", 0xa480, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java
index 43a3ffe..598374e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java
@@ -36,11 +36,11 @@ public final class GpsTagConstants {
TiffDirectoryType.EXIF_DIRECTORY_GPS);
private static final byte[] GPS_VERSION = new byte[] { (byte)2, (byte)3, (byte)0, (byte)0 };
-
+
public static byte[] gpsVersion() {
return GPS_VERSION.clone();
}
-
+
// ************************************************************
public static final TagInfoAscii GPS_TAG_GPS_LATITUDE_REF = new TagInfoAscii(
"GPSLatitudeRef", 0x0001, 2,
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
index d27d864..04c3d07 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoLong;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoUndefineds;
/**
- * Microsoft's HDP/WDP file format.
+ * Microsoft's HDP/WDP file format.
*/
public final class MicrosoftHdPhotoTagConstants {
@@ -163,7 +163,7 @@ public final class MicrosoftHdPhotoTagConstants {
public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 5;
public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 6;
public static final int TRANSFOMATION_VALUE_ROTATE_270_CW = 7;
-
+
public static final TagInfoLong EXIF_TAG_UNCOMPRESSED = new TagInfoLong(
"Uncompressed", 0xbc03,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -177,33 +177,33 @@ public final class MicrosoftHdPhotoTagConstants {
public static final TagInfoLong EXIF_TAG_IMAGE_WIDTH = new TagInfoLong(
"ImageWidth", 0xbc80,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoLong EXIF_TAG_IMAGE_HEIGHT = new TagInfoLong(
"ImageHeight", 0xbc81,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoFloat EXIF_TAG_WIDTH_RESOLUTION = new TagInfoFloat(
"WidthResolution", 0xbc82,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoFloat EXIF_TAG_HEIGHT_RESOLUTION = new TagInfoFloat(
"HeightResolution", 0xbc83,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
// FIXME: might be an offset?
public static final TagInfoLong EXIF_TAG_IMAGE_OFFSET = new TagInfoLong(
"ImageOffset", 0xbcc0,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoLong EXIF_TAG_IMAGE_BYTE_COUNT = new TagInfoLong(
"ImageByteCount", 0xbcc1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
// FIXME: might be an offset?
public static final TagInfoLong EXIF_TAG_ALPHA_OFFSET = new TagInfoLong(
"AlphaOffset", 0xbcc2,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoLong EXIF_TAG_ALPHA_BYTE_COUNT = new TagInfoLong(
"AlphaByteCount", 0xbcc3,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -227,7 +227,7 @@ public final class MicrosoftHdPhotoTagConstants {
public static final TagInfoUndefineds EXIF_TAG_PADDING = new TagInfoUndefineds(
"Padding", 0xea1c, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final List<TagInfo> ALL_MICROSOFT_HD_PHOTO_TAGS =
Collections.unmodifiableList(Arrays.asList(
EXIF_TAG_PIXEL_FORMAT,
@@ -253,7 +253,7 @@ public final class MicrosoftHdPhotoTagConstants {
(byte) 0x3D, (byte) 0x77, (byte) 0x76, (byte) 0x8D,
(byte) 0xC9, end });
}
-
+
private MicrosoftHdPhotoTagConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
index 6bab50a..a02094d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
@@ -28,7 +28,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShorts;
/**
* Molecular Dynamics GEL file format
- * <BR>
+ * <BR>
* http://www.awaresystems.be/imaging/tiff/tifftags/docs/gel.html
*/
public final class MolecularDynamicsGelTagConstants {
@@ -75,7 +75,7 @@ public final class MolecularDynamicsGelTagConstants {
EXIF_TAG_MD_PREP_DATE,
EXIF_TAG_MD_PREP_TIME,
EXIF_TAG_MD_FILE_UNITS));
-
+
private MolecularDynamicsGelTagConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java
index c4f570d..6e978a8 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java
@@ -45,14 +45,14 @@ public final class Rfc2301TagConstants {
public static final TagInfoShortOrLong TIFF_TAG_BAD_FAX_LINES = new TagInfoShortOrLong(
"BadFaxLines", 0x0146, 1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoShort TIFF_TAG_CLEAN_FAX_DATA = new TagInfoShort(
"CleanFaxData", 0x0147,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final int CLEAN_FAX_DATA_VALUE_CLEAN = 0;
public static final int CLEAN_FAX_DATA_VALUE_REGENERATED = 1;
public static final int CLEAN_FAX_DATA_VALUE_UNCLEAN = 2;
-
+
public static final TagInfoShortOrLong TIFF_TAG_CONSECUTIVE_BAD_FAX_LINES = new TagInfoShortOrLong(
"ConsecutiveBadFaxLines", 0x0148, 1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -60,13 +60,13 @@ public final class Rfc2301TagConstants {
public static final TagInfoDirectory TIFF_TAG_GLOBAL_PARAMETERS_IFD = new TagInfoDirectory(
"GlobalParametersIFD", 0x0190,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoLong TIFF_TAG_PROFILE_TYPE = new TagInfoLong(
"ProfileType", 0x0191,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final int PROFILE_TYPE_VALUE_UNSPECIFIED = 0;
public static final int PROFILE_TYPE_VALUE_GROUP_3_FAX = 1;
-
+
public static final TagInfoByte TIFF_TAG_FAX_PROFILE = new TagInfoByte(
"FaxProfile", 0x0192,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -77,7 +77,7 @@ public final class Rfc2301TagConstants {
public static final int FAX_PROFILE_VALUE_LOSSY_COLOR_AND_GRAYSCALE_C = 4;
public static final int FAX_PROFILE_VALUE_LOSSLESS_COLOR_AND_GRAYSCALE_L = 5;
public static final int FAX_PROFILE_VALUE_MIXED_RASTER_CONTENT_M = 6;
-
+
public static final TagInfoLong TIFF_TAG_CODING_METHODS = new TagInfoLong(
"CodingMethods", 0x0193,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -87,11 +87,11 @@ public final class Rfc2301TagConstants {
public static final int CODING_METHODS_VALUE_T82_T85 = 16;
public static final int CODING_METHODS_VALUE_T81 = 32;
public static final int CODING_METHODS_VALUE_T82_T43 = 64;
-
+
public static final TagInfoBytes TIFF_TAG_VERSION_YEAR = new TagInfoBytes(
"VersionYear", 0x0194, 4,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoByte TIFF_TAG_MODE_NUMBER = new TagInfoByte(
"ModeNumber", 0x0195,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -99,7 +99,7 @@ public final class Rfc2301TagConstants {
public static final TagInfoRationals TIFF_TAG_DECODE = new TagInfoRationals(
"Decode", 0x01b1, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoShorts TIFF_TAG_DEFAULT_IMAGE_COLOR = new TagInfoShorts(
"DefaultImageColor", 0x01b2, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
index 76e3b35..737b00e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
@@ -61,8 +61,8 @@ public final class TiffConstants {
public static final int TIFF_FLAG_T4_OPTIONS_UNCOMPRESSED_MODE = 2;
public static final int TIFF_FLAG_T4_OPTIONS_FILL = 4;
public static final int TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE = 2;
-
-
+
+
public static final String PARAM_KEY_SUBIMAGE_X = "SUBIMAGE_X";
public static final String PARAM_KEY_SUBIMAGE_Y = "SUBIMAGE_Y";
public static final String PARAM_KEY_SUBIMAGE_WIDTH = "SUBIMAGE_WIDTH";
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java
index 619c8de..70a4104 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java
@@ -22,7 +22,7 @@ public enum TiffDirectoryType {
TIFF_DIRECTORY_IFD1(
true, TiffDirectoryConstants.DIRECTORY_TYPE_DIR_1, "IFD1"),
-
+
TIFF_DIRECTORY_IFD2(
true, TiffDirectoryConstants.DIRECTORY_TYPE_DIR_2, "IFD2"),
@@ -37,17 +37,17 @@ public enum TiffDirectoryType {
false, TiffDirectoryConstants.DIRECTORY_TYPE_EXIF, "Exif IFD"),
EXIF_DIRECTORY_GPS(
false, TiffDirectoryConstants.DIRECTORY_TYPE_GPS, "GPS IFD");
-
+
private final boolean isImageDirectory;
public final int directoryType;
public final String name;
-
+
TiffDirectoryType(final boolean isImageDirectory, final int directoryType, final String name) {
this.isImageDirectory = isImageDirectory;
this.directoryType = directoryType;
this.name = name;
}
-
+
public boolean isImageDirectory() {
return isImageDirectory;
}
@@ -61,7 +61,7 @@ public enum TiffDirectoryType {
}
return TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN;
}
-
+
public static final TiffDirectoryType EXIF_DIRECTORY_IFD0 = TIFF_DIRECTORY_IFD0;
public static final TiffDirectoryType TIFF_DIRECTORY_ROOT = TIFF_DIRECTORY_IFD0;
public static final TiffDirectoryType EXIF_DIRECTORY_IFD1 = TIFF_DIRECTORY_IFD1;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java
index 48ddd26..755013c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java
@@ -33,14 +33,14 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShorts;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoUndefineds;
/**
- *
+ *
*/
public final class TiffEpTagConstants {
public static final TagInfoShorts EXIF_TAG_CFAREPEAT_PATTERN_DIM = new TagInfoShorts(
"CFARepeatPatternDim", 0x828d, 2,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoBytes EXIF_TAG_CFAPATTERN_2 = new TagInfoBytes(
"CFAPattern2", 0x828e, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -48,7 +48,7 @@ public final class TiffEpTagConstants {
public static final TagInfoAsciiOrRational EXIF_TAG_BATTERY_LEVEL = new TagInfoAsciiOrRational(
"BatteryLevel", 0x828f, -1,
TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-
+
public static final TagInfoUndefineds EXIF_TAG_INTER_COLOR_PROFILE = new TagInfoUndefineds(
"InterColorProfile", 0x8773, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -72,19 +72,19 @@ public final class TiffEpTagConstants {
public static final TagInfoUndefineds EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_1 = new TagInfoUndefineds(
"SpatialFrequencyResponse", 0x920c, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoUndefineds EXIF_TAG_NOISE_1 = new TagInfoUndefineds(
"Noise", 0x920d, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION = new TagInfoRational(
"FocalPlaneXResolution", 0x920e,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION = new TagInfoRational(
"FocalPlaneYResolution", 0x920f,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT = new TagInfoShort(
"FocalPlaneResolutionUnit", 0x9210,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -109,7 +109,7 @@ public final class TiffEpTagConstants {
public static final TagInfoRationals EXIF_TAG_EXPOSURE_INDEX = new TagInfoRationals(
"ExposureIndex", 0x9215, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
-
+
public static final TagInfoBytes EXIF_TAG_TIFF_EPSTANDARD_ID_1 = new TagInfoBytes(
"TIFF/EPStandardID", 0x9216, 4,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
index 3878b26..a44bf7d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -55,7 +55,7 @@ public final class DataReaderStrips extends ImageDataReader {
}
private void interpretStrip(
- final ImageBuilder imageBuilder,
+ final ImageBuilder imageBuilder,
final byte[] bytes,
final int pixelsPerStrip,
final int yLimit) throws ImageReadException, IOException {
@@ -217,16 +217,16 @@ public final class DataReaderStrips extends ImageDataReader {
}
}
-
-
+
+
@Override
public BufferedImage readImageData(final Rectangle subImage)
throws ImageReadException, IOException
{
// the legacy code is optimized to the reading of whole
// strips (except for the last strip in the image, which can
- // be a partial). So create a working image with compatible
- // dimensions and read that. Later on, the working image
+ // be a partial). So create a working image with compatible
+ // dimensions and read that. Later on, the working image
// will be sub-imaged to the proper size.
// strip0 and strip1 give the indices of the strips containing
@@ -237,17 +237,17 @@ public final class DataReaderStrips extends ImageDataReader {
// the legacy code uses a member element "y" to keep track
- // of the row index of the output image that is being processed
- // by interpretStrip. y is set to zero before the first
+ // of the row index of the output image that is being processed
+ // by interpretStrip. y is set to zero before the first
// call to interpretStrip. y0 will be the index of the first row
// in the full image (the source image) that will be processed.
-
+
final int y0 = strip0 * rowsPerStrip;
final int yLimit = subImage.y - y0 + subImage.height;
// TO DO: we can probably save some processing by using yLimit instead
- // or working
+ // or working
final ImageBuilder workingBuilder =
new ImageBuilder(width, workingHeight, false);
@@ -270,7 +270,7 @@ public final class DataReaderStrips extends ImageDataReader {
(int) pixelsPerStrip,
yLimit);
}
-
+
if (subImage.x == 0
&& subImage.y == y0
@@ -283,7 +283,7 @@ public final class DataReaderStrips extends ImageDataReader {
subImage.x,
subImage.y - y0,
subImage.width,
- subImage.height);
+ subImage.height);
}
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
index 91ca4c5..dae6d1f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
@@ -180,7 +180,7 @@ public final class DataReaderTiled extends ImageDataReader {
}
}
-
+
@Override
public BufferedImage readImageData(final Rectangle subImage)
throws ImageReadException, IOException
@@ -192,7 +192,7 @@ public final class DataReaderTiled extends ImageDataReader {
int y = 0;
// tileWidth is the width of the tile
- // tileLength is the height of the tile
+ // tileLength is the height of the tile
final int col0 = subImage.x / tileWidth;
final int col1 = (subImage.x + subImage.width - 1) / tileWidth;
final int row0 = subImage.y / tileLength;
@@ -207,10 +207,10 @@ public final class DataReaderTiled extends ImageDataReader {
final int x0 = col0 * tileWidth;
final int y0 = row0 * tileLength;
-
+
final ImageBuilder workingBuilder =
new ImageBuilder(workingWidth, workingHeight, false);
-
+
for (int iRow = row0; iRow <= row1; iRow++) {
for (int iCol = col0; iCol <= col1; iCol++) {
final int tile = iRow * nColumnsOfTiles + iCol;
@@ -222,12 +222,12 @@ public final class DataReaderTiled extends ImageDataReader {
interpretTile(workingBuilder, decompressed, x, y, workingWidth, workingHeight);
}
}
-
+
if (subImage.x == x0
&& subImage.y == y0
&& subImage.width == workingWidth
&& subImage.height == workingHeight) {
- return workingBuilder.getBufferedImage();
+ return workingBuilder.getBufferedImage();
}
return workingBuilder.getSubimage(
subImage.x - x0,
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
index ab182e2..19f25a1 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
@@ -93,10 +93,10 @@ public abstract class ImageDataReader {
}
return true;
}
-
+
/**
* Reads samples and returns them in an int array.
- *
+ *
* @param bis
* the stream to read from
* @param result
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java b/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java
index b1708c0..5c259cb 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java
@@ -46,7 +46,7 @@ public abstract class FieldType {
private final int type;
private final String name;
private final int elementSize;
-
+
public static final List<FieldType> ANY =
Collections.unmodifiableList(Arrays.asList(
BYTE, ASCII, SHORT,
@@ -58,31 +58,31 @@ public abstract class FieldType {
public static final List<FieldType> SHORT_OR_LONG =
Collections.unmodifiableList(Arrays.asList(
SHORT, LONG));
-
+
public static final List<FieldType> SHORT_OR_RATIONAL =
Collections.unmodifiableList(Arrays.asList(
SHORT, RATIONAL));
-
+
public static final List<FieldType> SHORT_OR_LONG_OR_RATIONAL =
Collections.unmodifiableList(Arrays.asList(
SHORT, LONG, RATIONAL));
-
+
public static final List<FieldType> LONG_OR_SHORT =
Collections.unmodifiableList(Arrays.asList(
SHORT, LONG));
-
+
public static final List<FieldType> BYTE_OR_SHORT =
Collections.unmodifiableList(Arrays.asList(
SHORT, BYTE));
-
+
public static final List<FieldType> LONG_OR_IFD =
Collections.unmodifiableList(Arrays.asList(
(FieldType) LONG, IFD));
-
+
public static final List<FieldType> ASCII_OR_RATIONAL =
Collections.unmodifiableList(Arrays.asList(
ASCII, RATIONAL));
-
+
public static final List<FieldType> ASCII_OR_BYTE =
Collections.unmodifiableList(Arrays.asList(
ASCII, BYTE));
@@ -92,20 +92,20 @@ public abstract class FieldType {
this.name = name;
this.elementSize = elementSize;
}
-
-
+
+
public int getType() {
return type;
}
-
+
public String getName() {
return name;
}
-
+
public int getSize() {
return elementSize;
}
-
+
public static FieldType getFieldType(final int type) throws ImageReadException {
for (final FieldType fieldType : ANY) {
if (fieldType.getType() == type) {
@@ -114,7 +114,7 @@ public abstract class FieldType {
}
throw new ImageReadException("Field type " + type + " is unsupported");
}
-
+
public abstract Object getValue(final TiffField entry);
public abstract byte[] writeData(final Object o, final ByteOrder byteOrder) throws ImageWriteException;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
index c3c707c..ff3e30a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
@@ -39,7 +39,7 @@ public abstract class PhotometricInterpreter {
public abstract void interpretPixel(ImageBuilder imageBuilder,
int[] samples, int x, int y) throws ImageReadException, IOException;
-
+
protected int getBitsPerSample(final int offset) {
return bitsPerSample[offset];
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
index c701b86..9b3ec33 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
@@ -41,7 +41,7 @@ public class PhotometricInterpreterYCbCr extends PhotometricInterpreter {
* imageWidth and imageHeight. These variables are either set manually in
* the case of a null constructor, or they are automatically calculated from
* the image parameter constructor.
- *
+ *
* @param Y
* The Y component set.
* @param Cb
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
index 4ab7281..d7ff6e5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
@@ -76,7 +76,7 @@ public class TagInfo {
}
/**
- *
+ *
* @param entry the TIFF field whose value to return
* @return the value of the TIFF field
* @throws ImageReadException thrown by subclasses
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByte.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByte.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByte.java
index fc3f706..6ada6cc 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByte.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByte.java
@@ -26,7 +26,7 @@ public class TagInfoByte extends TagInfo {
public TagInfoByte(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.BYTE, 1, directoryType);
}
-
+
public TagInfoByte(final String name, final int tag, final List<FieldType> fieldTypes,
final TiffDirectoryType directoryType) {
super(name, tag, fieldTypes, 1, directoryType);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteOrShort.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteOrShort.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteOrShort.java
index 56fce73..a111aea 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteOrShort.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoByteOrShort.java
@@ -26,11 +26,11 @@ public class TagInfoByteOrShort extends TagInfo {
public TagInfoByteOrShort(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.BYTE_OR_SHORT, length, directoryType);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final byte... values) {
return values;
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoBytes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoBytes.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoBytes.java
index a800d14..8907646 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoBytes.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoBytes.java
@@ -26,7 +26,7 @@ public class TagInfoBytes extends TagInfo {
public TagInfoBytes(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.BYTE, length, directoryType);
}
-
+
public TagInfoBytes(final String name, final int tag, final List<FieldType> fieldTypes,
final int length, final TiffDirectoryType directoryType) {
super(name, tag, fieldTypes, length, directoryType);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDouble.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDouble.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDouble.java
index b282d4f..d5a22dc 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDouble.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDouble.java
@@ -26,11 +26,11 @@ public class TagInfoDouble extends TagInfo {
public TagInfoDouble(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.DOUBLE, 1, directoryType);
}
-
+
public double getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toDouble(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final double value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDoubles.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDoubles.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDoubles.java
index 9043efc..6d1a512 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDoubles.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoDoubles.java
@@ -26,11 +26,11 @@ public class TagInfoDoubles extends TagInfo {
public TagInfoDoubles(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.DOUBLE, length, directoryType);
}
-
+
public double[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toDoubles(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final double... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloat.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloat.java
index d18982e..c8fad33 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloat.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloat.java
@@ -26,11 +26,11 @@ public class TagInfoFloat extends TagInfo {
public TagInfoFloat(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.FLOAT, 1, directoryType);
}
-
+
public float getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toFloat(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final float value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloats.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloats.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloats.java
index c8f5d9a..c90ee90 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloats.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoFloats.java
@@ -26,11 +26,11 @@ public class TagInfoFloats extends TagInfo {
public TagInfoFloats(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.FLOAT, length, directoryType);
}
-
+
public float[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toFloats(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final float... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
index 323bc45..90715ea 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
@@ -32,7 +32,7 @@ import org.apache.commons.imaging.internal.Debug;
* Used by some GPS tags and the EXIF user comment tag,
* this badly documented value is meant to contain
* the text encoding in the first 8 bytes followed by
- * the non-null-terminated text in an unknown byte order.
+ * the non-null-terminated text in an unknown byte order.
*/
public final class TagInfoGpsText extends TagInfo {
private static final TagInfoGpsText.TextEncoding TEXT_ENCODING_ASCII = new TextEncoding(
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLong.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLong.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLong.java
index 78aa7b2..3b72a71 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLong.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLong.java
@@ -27,15 +27,15 @@ public class TagInfoLong extends TagInfo {
public TagInfoLong(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.LONG, 1, directoryType);
}
-
+
public TagInfoLong(final String name, final int tag, final TiffDirectoryType directoryType, final boolean isOffset) {
super(name, tag, FieldType.LONG, 1, directoryType, isOffset);
}
-
+
public int getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toInt(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongOrIFD.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongOrIFD.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongOrIFD.java
index 2814898..2345d5a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongOrIFD.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongOrIFD.java
@@ -27,15 +27,15 @@ public class TagInfoLongOrIFD extends TagInfo {
public TagInfoLongOrIFD(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.LONG_OR_IFD, length, directoryType);
}
-
+
public TagInfoLongOrIFD(final String name, final int tag, final int length, final TiffDirectoryType directoryType, final boolean isOffset) {
super(name, tag, FieldType.LONG_OR_IFD, length, directoryType, isOffset);
}
-
+
public int[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toInts(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongs.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongs.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongs.java
index 2f95e25..a2aba04 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongs.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoLongs.java
@@ -26,15 +26,15 @@ public class TagInfoLongs extends TagInfo {
public TagInfoLongs(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.LONG, length, directoryType);
}
-
+
public TagInfoLongs(final String name, final int tag, final int length, final TiffDirectoryType directoryType, final boolean isOffset) {
super(name, tag, FieldType.LONG, length, directoryType, isOffset);
}
-
+
public int[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toInts(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRational.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRational.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRational.java
index 0e5391c..c113ff6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRational.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRational.java
@@ -31,7 +31,7 @@ public class TagInfoRational extends TagInfo {
public RationalNumber getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toRational(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final RationalNumber value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRationals.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRationals.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRationals.java
index f3ccb7f..e4fde59 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRationals.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoRationals.java
@@ -31,7 +31,7 @@ public class TagInfoRationals extends TagInfo {
public RationalNumber[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toRationals(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final RationalNumber... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java
index 833b46a..606e4ef 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLong.java
@@ -26,11 +26,11 @@ public class TagInfoSLong extends TagInfo {
public TagInfoSLong(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SLONG, 1, directoryType);
}
-
+
public int getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toInt(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongs.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongs.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongs.java
index 83976be..6eba86b 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongs.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSLongs.java
@@ -26,11 +26,11 @@ public class TagInfoSLongs extends TagInfo {
public TagInfoSLongs(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SLONG, length, directoryType);
}
-
+
public int[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toInts(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java
index f624251..8df641f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRational.java
@@ -31,7 +31,7 @@ public class TagInfoSRational extends TagInfo {
public RationalNumber getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toRational(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final RationalNumber value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRationals.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRationals.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRationals.java
index 95200a8..350ed13 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRationals.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSRationals.java
@@ -31,7 +31,7 @@ public class TagInfoSRationals extends TagInfo {
public RationalNumber[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toRationals(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final RationalNumber... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java
index 9baf5ce..1cb9bb0 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShort.java
@@ -26,11 +26,11 @@ public class TagInfoSShort extends TagInfo {
public TagInfoSShort(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SSHORT, 1, directoryType);
}
-
+
public short getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toShort(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short value) {
return ByteConversions.toBytes(value, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShorts.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShorts.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShorts.java
index d32061e..a4a0aa9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShorts.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoSShorts.java
@@ -26,11 +26,11 @@ public class TagInfoSShorts extends TagInfo {
public TagInfoSShorts(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SSHORT, length, directoryType);
}
-
+
public short[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toShorts(bytes, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java
index 4d926c9..0b00f07 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShort.java
@@ -26,7 +26,7 @@ public class TagInfoShort extends TagInfo {
public TagInfoShort(final String name, final int tag, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SHORT, 1, directoryType);
}
-
+
public short getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toShort(bytes, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java
index 1b62bc7..266d9cf 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLong.java
@@ -26,15 +26,15 @@ public class TagInfoShortOrLong extends TagInfo {
public TagInfoShortOrLong(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SHORT_OR_LONG, length, directoryType, false);
}
-
+
public TagInfoShortOrLong(final String name, final int tag, final int length, final TiffDirectoryType directoryType, final boolean isOffset) {
super(name, tag, FieldType.SHORT_OR_LONG, length, directoryType, isOffset);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short... values) {
return ByteConversions.toBytes(values, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java
index b99b428..90f9148 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrLongOrRational.java
@@ -27,15 +27,15 @@ public class TagInfoShortOrLongOrRational extends TagInfo {
public TagInfoShortOrLongOrRational(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SHORT_OR_LONG_OR_RATIONAL, length, directoryType);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short... values) {
return ByteConversions.toBytes(values, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final int... values) {
return ByteConversions.toBytes(values, byteOrder);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final RationalNumber... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java
index 167749e..16913ee 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShortOrRational.java
@@ -27,7 +27,7 @@ public class TagInfoShortOrRational extends TagInfo {
public TagInfoShortOrRational(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SHORT_OR_RATIONAL, length, directoryType, false);
}
-
+
public byte[] encodeValue(final ByteOrder byteOrder, final short... values) {
return ByteConversions.toBytes(values, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShorts.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShorts.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShorts.java
index 21adb02..299e45e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShorts.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoShorts.java
@@ -26,7 +26,7 @@ public class TagInfoShorts extends TagInfo {
public TagInfoShorts(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.SHORT, length, directoryType);
}
-
+
public short[] getValue(final ByteOrder byteOrder, final byte[] bytes) {
return ByteConversions.toShorts(bytes, byteOrder);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
index 220dacf..db44ff5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java
@@ -22,7 +22,7 @@ class ImageDataOffsets {
final int[] imageDataOffsets;
final TiffOutputField imageDataOffsetsField;
final TiffOutputItem[] outputItems;
-
+
ImageDataOffsets(final TiffElement.DataElement[] imageData,
final int[] imageDataOffsets,
final TiffOutputField imageDataOffsetsField) {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index 6c09b49..8b67f09 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -67,7 +67,7 @@ public abstract class TiffImageWriterBase {
throws ImageWriteException {
final List<TiffOutputDirectory> directories = outputSet.getDirectories();
- if (directories.isEmpty()) {
+ if (directories.isEmpty()) {
throw new ImageWriteException("No directories.");
}
@@ -456,7 +456,7 @@ public abstract class TiffImageWriterBase {
(short) 0);
directory.add(TiffTagConstants.TIFF_TAG_XRESOLUTION,
RationalNumber.valueOf(pixelDensity.getRawHorizontalDensity()));
- directory.add(TiffTagConstants.TIFF_TAG_YRESOLUTION,
+ directory.add(TiffTagConstants.TIFF_TAG_YRESOLUTION,
RationalNumber.valueOf(pixelDensity.getRawVerticalDensity()));
} else if (pixelDensity.isInInches()) {
directory.add(TiffTagConstants.TIFF_TAG_RESOLUTION_UNIT,
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index 43c7f17..729615a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -89,7 +89,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
if (oversizeValue != null) {
final TiffOutputField frozenField = frozenFields.get(field.getTag());
if (frozenField != null
- && frozenField.getSeperateValue() != null
+ && frozenField.getSeperateValue() != null
&& frozenField.bytesEqual(field.getByteArrayValue())) {
frozenField.getSeperateValue().setOffset(field.getOffset());
} else {
@@ -145,7 +145,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
public void write(final OutputStream os, final TiffOutputSet outputSet)
throws IOException, ImageWriteException {
// There are some fields whose address in the file must not change,
- // unless of course their value is changed.
+ // unless of course their value is changed.
final Map<Integer, TiffOutputField> frozenFields = new HashMap<>();
final TiffOutputField makerNoteField = outputSet.findField(ExifTagConstants.EXIF_TAG_MAKER_NOTE);
if (makerNoteField != null && makerNoteField.getSeperateValue() != null) {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 02ceeac..83f1caa 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -568,7 +568,7 @@ public final class TiffOutputDirectory extends TiffOutputItem {
* If there is no field matching the given TagInfo, null will be returned.
* </p>
*
- * @param tagInfo the TagInfo specifying the field
+ * @param tagInfo the TagInfo specifying the field
* @return the field matching tagInfo or null, if the field isn't present
* @see #findField(int)
*/
@@ -583,7 +583,7 @@ public final class TiffOutputDirectory extends TiffOutputItem {
* If there is no field matching the given tag, null will be returned.
* </p>
*
- * @param tag the tag specifying the field
+ * @param tag the tag specifying the field
* @return the field matching tagInfo or null, if the field isn't present
* @see #findField(TagInfo)
*/
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
index d685f80..c77d100 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
@@ -101,7 +101,7 @@ public class TiffOutputField {
protected final boolean isLocalValue() {
return bytes.length <= TIFF_ENTRY_MAX_VALUE_LENGTH;
}
-
+
public boolean bytesEqual(final byte[] data) {
return Arrays.equals(bytes, data);
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index 815cdff..d9f7075 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -127,7 +127,7 @@ public final class TiffOutputSet {
/**
* A convenience method to update GPS values in EXIF metadata.
- *
+ *
* @param longitude
* Longitude in degrees E, negative values are W.
* @param latitude
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
index c26045c..af91d7b 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
@@ -30,7 +30,7 @@ class TiffOutputSummary {
public final Map<Integer, TiffOutputDirectory> directoryTypeMap;
private final List<OffsetItem> offsetItems = new ArrayList<>();
private final List<ImageDataOffsets> imageDataItems = new ArrayList<>();
-
+
public TiffOutputSummary(final ByteOrder byteOrder,
final TiffOutputDirectory rootDirectory,
final Map<Integer, TiffOutputDirectory> directoryTypeMap) {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/f108400a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
index bd1b787..deea19e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
@@ -2,9 +2,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -265,7 +265,7 @@ public class WbmpImageParser extends ImageParser {
/**
* Extracts embedded XML metadata as XML string.
* <p>
- *
+ *
* @param byteSource
* File containing image data.
* @param params