This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 1f9cd377 Better internal class name
1f9cd377 is described below
commit 1f9cd377a0fdf5c7b19b73becff3bcb019fd2308
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Aug 18 11:00:28 2023 -0400
Better internal class name
---
.../{PixelParser.java => AbstractPixelParser.java} | 4 ++--
...serSimple.java => AbstractPixelParserSimple.java} | 4 ++--
.../imaging/formats/bmp/BmpImageContents.java | 6 +++---
.../commons/imaging/formats/bmp/BmpImageParser.java | 14 +++++++-------
.../imaging/formats/bmp/PixelParserBitFields.java | 2 +-
.../commons/imaging/formats/bmp/PixelParserRgb.java | 2 +-
.../commons/imaging/formats/bmp/PixelParserRle.java | 2 +-
...ScanExpediter.java => AbstractScanExpediter.java} | 4 ++--
.../commons/imaging/formats/png/PngImageParser.java | 8 ++++----
.../imaging/formats/png/ScanExpediterInterlaced.java | 2 +-
.../imaging/formats/png/ScanExpediterSimple.java | 2 +-
.../pnm/{FileInfo.java => AbstractFileInfo.java} | 4 ++--
.../commons/imaging/formats/pnm/PamFileInfo.java | 2 +-
.../commons/imaging/formats/pnm/PbmFileInfo.java | 2 +-
.../commons/imaging/formats/pnm/PgmFileInfo.java | 2 +-
.../commons/imaging/formats/pnm/PnmImageParser.java | 10 +++++-----
.../commons/imaging/formats/pnm/PpmFileInfo.java | 2 +-
...ffOutputItem.java => AbstractTiffOutputItem.java} | 4 ++--
.../imaging/formats/tiff/write/ImageDataOffsets.java | 6 +++---
.../formats/tiff/write/TiffImageWriterLossless.java | 20 ++++++++++----------
.../formats/tiff/write/TiffImageWriterLossy.java | 10 +++++-----
.../formats/tiff/write/TiffOutputDirectory.java | 10 +++++-----
.../imaging/formats/tiff/write/TiffOutputField.java | 6 +++---
.../imaging/formats/tiff/write/TiffOutputSet.java | 4 ++--
.../formats/tiff/write/TiffOutputSummary.java | 8 ++++----
.../formats/tiff/write/PrintShallowSizes.java | 2 +-
26 files changed, 71 insertions(+), 71 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParser.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParser.java
similarity index 92%
rename from
src/main/java/org/apache/commons/imaging/formats/bmp/PixelParser.java
rename to
src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParser.java
index 0ef318df..dafdd594 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParser.java
+++
b/src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParser.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.ImageBuilder;
-abstract class PixelParser {
+abstract class AbstractPixelParser {
final BmpHeaderInfo bhi;
final byte[] colorTable;
@@ -31,7 +31,7 @@ abstract class PixelParser {
final InputStream is;
- PixelParser(final BmpHeaderInfo bhi, final byte[] colorTable, final byte[]
imageData) {
+ AbstractPixelParser(final BmpHeaderInfo bhi, final byte[] colorTable,
final byte[] imageData) {
this.bhi = bhi;
this.colorTable = colorTable;
this.imageData = imageData;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserSimple.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParserSimple.java
similarity index 90%
rename from
src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserSimple.java
rename to
src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParserSimple.java
index 81d15855..30b60c22 100644
---
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserSimple.java
+++
b/src/main/java/org/apache/commons/imaging/formats/bmp/AbstractPixelParserSimple.java
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.ImageBuilder;
-abstract class PixelParserSimple extends PixelParser {
- PixelParserSimple(final BmpHeaderInfo bhi, final byte[] colorTable, final
byte[] imageData) {
+abstract class AbstractPixelParserSimple extends AbstractPixelParser {
+ AbstractPixelParserSimple(final BmpHeaderInfo bhi, final byte[]
colorTable, final byte[] imageData) {
super(bhi, colorTable, imageData);
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java
index dcded90e..9b96df45 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageContents.java
@@ -21,13 +21,13 @@ class BmpImageContents {
final BmpHeaderInfo bhi;
final byte[] colorTable;
final byte[] imageData;
- final PixelParser pixelParser;
+ final AbstractPixelParser abstractPixelParser;
- BmpImageContents(final BmpHeaderInfo bhi, final byte[] colorTable, final
byte[] imageData, final PixelParser pixelParser) {
+ BmpImageContents(final BmpHeaderInfo bhi, final byte[] colorTable, final
byte[] imageData, final AbstractPixelParser abstractPixelParser) {
this.bhi = bhi;
this.colorTable = colorTable;
this.imageData = imageData;
- this.pixelParser = pixelParser;
+ this.abstractPixelParser = abstractPixelParser;
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
index 9beb6961..5742404b 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
@@ -139,9 +139,9 @@ public class BmpImageParser extends
ImageParser<BmpImagingParameters> {
LOGGER.fine("width*height*4: " + width * height * 4);
}
- final PixelParser pixelParser = ic.pixelParser;
+ final AbstractPixelParser abstractPixelParser = ic.abstractPixelParser;
final ImageBuilder imageBuilder = new ImageBuilder(width, height,
true);
- pixelParser.processImage(imageBuilder);
+ abstractPixelParser.processImage(imageBuilder);
return imageBuilder.getBufferedImage();
@@ -621,25 +621,25 @@ public class BmpImageParser extends
ImageParser<BmpImagingParameters> {
debugNumber("ImageData.length", imageData.length, 4);
}
- PixelParser pixelParser;
+ AbstractPixelParser abstractPixelParser;
switch (bhi.compression) {
case BI_RLE4:
case BI_RLE8:
- pixelParser = new PixelParserRle(bhi, colorTable, imageData);
+ abstractPixelParser = new PixelParserRle(bhi, colorTable,
imageData);
break;
case BI_RGB:
- pixelParser = new PixelParserRgb(bhi, colorTable, imageData);
+ abstractPixelParser = new PixelParserRgb(bhi, colorTable,
imageData);
break;
case BI_BITFIELDS:
- pixelParser = new PixelParserBitFields(bhi, colorTable, imageData);
+ abstractPixelParser = new PixelParserBitFields(bhi, colorTable,
imageData);
break;
default:
throw new ImagingException("BMP: Unknown Compression: "
+ bhi.compression);
}
- return new BmpImageContents(bhi, colorTable, imageData, pixelParser);
+ return new BmpImageContents(bhi, colorTable, imageData,
abstractPixelParser);
}
@Override
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java
index 65a604eb..cfa42ad7 100644
---
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java
+++
b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java
@@ -26,7 +26,7 @@ import java.nio.ByteOrder;
import org.apache.commons.imaging.ImagingException;
-class PixelParserBitFields extends PixelParserSimple {
+class PixelParserBitFields extends AbstractPixelParserSimple {
private final int redShift;
private final int greenShift;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java
index 4f533cc3..84a806e9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java
@@ -24,7 +24,7 @@ import java.nio.ByteOrder;
import org.apache.commons.imaging.ImagingException;
-class PixelParserRgb extends PixelParserSimple {
+class PixelParserRgb extends AbstractPixelParserSimple {
private int byteCount;
private int cachedBitCount;
private int cachedByte;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRle.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRle.java
index 7800cf55..a280b9a0 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRle.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRle.java
@@ -23,7 +23,7 @@ import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.BinaryFunctions;
import org.apache.commons.imaging.common.ImageBuilder;
-class PixelParserRle extends PixelParser {
+class PixelParserRle extends AbstractPixelParser {
private static final Logger LOGGER =
Logger.getLogger(PixelParserRle.class.getName());
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
b/src/main/java/org/apache/commons/imaging/formats/png/AbstractScanExpediter.java
similarity index 98%
rename from
src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
rename to
src/main/java/org/apache/commons/imaging/formats/png/AbstractScanExpediter.java
index 812509c1..6c658bea 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/AbstractScanExpediter.java
@@ -33,7 +33,7 @@ import
org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterSub;
import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterUp;
import
org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilter;
-abstract class ScanExpediter {
+abstract class AbstractScanExpediter {
final int width;
final int height;
@@ -47,7 +47,7 @@ abstract class ScanExpediter {
final GammaCorrection gammaCorrection;
final TransparencyFilter transparencyFilter;
- ScanExpediter(final int width, final int height, final InputStream is,
+ AbstractScanExpediter(final int width, final int height, final InputStream
is,
final BufferedImage bi, final PngColorType pngColorType, final int
bitDepth, final int bitsPerPixel,
final PngChunkPlte pngChunkPLTE, final GammaCorrection
gammaCorrection,
final TransparencyFilter transparencyFilter) {
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index 96147ce7..39d3fa53 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -284,16 +284,16 @@ public class PngImageParser extends
ImageParser<PngImagingParameters> implement
final ByteArrayInputStream bais = new
ByteArrayInputStream(compressed);
final InflaterInputStream iis = new InflaterInputStream(bais);
- ScanExpediter scanExpediter;
+ AbstractScanExpediter abstractScanExpediter;
switch (pngChunkIHDR.getInterlaceMethod()) {
case NONE:
- scanExpediter = new ScanExpediterSimple(width, height, iis,
+ abstractScanExpediter = new ScanExpediterSimple(width,
height, iis,
result, pngColorType, bitDepth, bitsPerPixel,
pngChunkPLTE, gammaCorrection, transparencyFilter);
break;
case ADAM7:
- scanExpediter = new ScanExpediterInterlaced(width, height,
iis,
+ abstractScanExpediter = new ScanExpediterInterlaced(width,
height, iis,
result, pngColorType, bitDepth, bitsPerPixel,
pngChunkPLTE, gammaCorrection, transparencyFilter);
break;
@@ -301,7 +301,7 @@ public class PngImageParser extends
ImageParser<PngImagingParameters> implement
throw new ImagingException("Unknown InterlaceMethod: " +
pngChunkIHDR.getInterlaceMethod());
}
- scanExpediter.drive();
+ abstractScanExpediter.drive();
if (iccProfile != null) {
final boolean isSrgb = new
IccProfileParser().isSrgb(iccProfile);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
index 0e60d833..c3cc9f2f 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
import
org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilter;
-class ScanExpediterInterlaced extends ScanExpediter {
+class ScanExpediterInterlaced extends AbstractScanExpediter {
private static final int[] STARTING_ROW = { 0, 0, 4, 0, 2, 0, 1 };
private static final int[] STARTING_COL = { 0, 4, 0, 2, 0, 1, 0 };
private static final int[] ROW_INCREMENT = { 8, 8, 8, 4, 4, 2, 2 };
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
index a605544e..1d52b936 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
import
org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilter;
-class ScanExpediterSimple extends ScanExpediter {
+class ScanExpediterSimple extends AbstractScanExpediter {
ScanExpediterSimple(final int width, final int height, final InputStream
is,
final BufferedImage bi, final PngColorType pngColorType, final int
bitDepth, final int bitsPerPixel,
final PngChunkPlte pngChunkPLTE, final GammaCorrection
gammaCorrection,
diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/AbstractFileInfo.java
similarity index 97%
rename from src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
rename to
src/main/java/org/apache/commons/imaging/formats/pnm/AbstractFileInfo.java
index a014f17a..cbccc4a9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/AbstractFileInfo.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.ImageBuilder;
-abstract class FileInfo {
+abstract class AbstractFileInfo {
static int readSample(final InputStream is, final int bytesPerSample)
throws IOException {
int sample = 0;
@@ -57,7 +57,7 @@ abstract class FileInfo {
final boolean rawBits;
- FileInfo(final int width, final int height, final boolean rawBits) {
+ AbstractFileInfo(final int width, final int height, final boolean rawBits)
{
this.width = width;
this.height = height;
this.rawBits = rawBits;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
index 39408253..8b5b30ed 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
@@ -25,7 +25,7 @@ import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImagingException;
-class PamFileInfo extends FileInfo {
+class PamFileInfo extends AbstractFileInfo {
private class ColorTupleReader extends TupleReader {
@Override
public ImageInfo.ColorType getColorType() {
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
index 8a1524b2..4542c216 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImagingException;
-class PbmFileInfo extends FileInfo {
+class PbmFileInfo extends AbstractFileInfo {
private int bitCache;
private int bitsInCache;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
index 9ba1500a..6b66e3b0 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImagingException;
-class PgmFileInfo extends FileInfo {
+class PgmFileInfo extends AbstractFileInfo {
private final int max;
private final float scale;
private final int bytesPerSample;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
index 3cefdc5d..e3e470a4 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
@@ -91,7 +91,7 @@ public class PnmImageParser extends
ImageParser<PnmImagingParameters> {
public BufferedImage getBufferedImage(final ByteSource byteSource, final
PnmImagingParameters params)
throws ImagingException, IOException {
try (InputStream is = byteSource.getInputStream()) {
- final FileInfo info = readHeader(is);
+ final AbstractFileInfo info = readHeader(is);
final int width = info.width;
final int height = info.height;
@@ -124,7 +124,7 @@ public class PnmImageParser extends
ImageParser<PnmImagingParameters> {
@Override
public ImageInfo getImageInfo(final ByteSource byteSource, final
PnmImagingParameters params)
throws ImagingException, IOException {
- final FileInfo info = readHeader(byteSource);
+ final AbstractFileInfo info = readHeader(byteSource);
final List<String> comments = new ArrayList<>();
@@ -160,7 +160,7 @@ public class PnmImageParser extends
ImageParser<PnmImagingParameters> {
@Override
public Dimension getImageSize(final ByteSource byteSource, final
PnmImagingParameters params)
throws ImagingException, IOException {
- final FileInfo info = readHeader(byteSource);
+ final AbstractFileInfo info = readHeader(byteSource);
return new Dimension(info.width, info.height);
}
@@ -176,14 +176,14 @@ public class PnmImageParser extends
ImageParser<PnmImagingParameters> {
return "Pbm-Custom";
}
- private FileInfo readHeader(final ByteSource byteSource)
+ private AbstractFileInfo readHeader(final ByteSource byteSource)
throws ImagingException, IOException {
try (InputStream is = byteSource.getInputStream()) {
return readHeader(is);
}
}
- private FileInfo readHeader(final InputStream is) throws ImagingException,
+ private AbstractFileInfo readHeader(final InputStream is) throws
ImagingException,
IOException {
final byte identifier1 = readByte("Identifier1", is, "Not a Valid PNM
File");
final byte identifier2 = readByte("Identifier2", is, "Not a Valid PNM
File");
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
index bd6843c2..2841cb0e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImagingException;
-class PpmFileInfo extends FileInfo {
+class PpmFileInfo extends AbstractFileInfo {
private final int max;
private final float scale;
private final int bytesPerSample;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffOutputItem.java
similarity index 95%
rename from
src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
rename to
src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffOutputItem.java
index 316b3920..c6200676 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffOutputItem.java
@@ -21,9 +21,9 @@ import java.io.IOException;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-abstract class TiffOutputItem {
+abstract class AbstractTiffOutputItem {
- public static class Value extends TiffOutputItem {
+ public static class Value extends AbstractTiffOutputItem {
static final int SHALLOW_SIZE = 32;
private final byte[] bytes;
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 c227bd13..03cf81fa 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
@@ -24,14 +24,14 @@ import org.apache.commons.imaging.formats.tiff.TiffElement;
class ImageDataOffsets {
final int[] imageDataOffsets;
final TiffOutputField imageDataOffsetsField;
- final TiffOutputItem[] outputItems;
+ final AbstractTiffOutputItem[] outputItems;
ImageDataOffsets(final TiffElement.DataElement[] imageData, final int[]
imageDataOffsets, final TiffOutputField imageDataOffsetsField) {
this.imageDataOffsets = imageDataOffsets;
this.imageDataOffsetsField = imageDataOffsetsField;
- outputItems = Allocator.array(imageData.length, TiffOutputItem[]::new,
TiffOutputItem.Value.SHALLOW_SIZE);
- Arrays.setAll(outputItems, i -> new TiffOutputItem.Value("TIFF image
data", imageData[i].getData()));
+ outputItems = Allocator.array(imageData.length,
AbstractTiffOutputItem[]::new, AbstractTiffOutputItem.Value.SHALLOW_SIZE);
+ Arrays.setAll(outputItems, i -> new AbstractTiffOutputItem.Value("TIFF
image data", imageData[i].getData()));
}
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 f4db5595..e6281ec7 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
@@ -74,7 +74,7 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
}
}
private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR =
Comparator.comparingInt(e -> e.length);
- private static final Comparator<TiffOutputItem> ITEM_SIZE_COMPARATOR =
Comparator.comparingInt(TiffOutputItem::getItemLength);
+ private static final Comparator<AbstractTiffOutputItem>
ITEM_SIZE_COMPARATOR =
Comparator.comparingInt(AbstractTiffOutputItem::getItemLength);
private final byte[] exifBytes;
@@ -156,7 +156,7 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
}
private long updateOffsetsStep(final List<TiffElement> analysis,
- final List<TiffOutputItem> outputItems) {
+ final List<AbstractTiffOutputItem> outputItems) {
// items we cannot fit into a gap, we shall append to tail.
long overflowIndex = exifBytes.length;
@@ -183,14 +183,14 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
Collections.reverse(unusedElements);
// make copy.
- final List<TiffOutputItem> unplacedItems = new ArrayList<>(
+ final List<AbstractTiffOutputItem> unplacedItems = new ArrayList<>(
outputItems);
unplacedItems.sort(ITEM_SIZE_COMPARATOR);
Collections.reverse(unplacedItems);
while (!unplacedItems.isEmpty()) {
// pop off largest unplaced item.
- final TiffOutputItem outputItem = unplacedItems.remove(0);
+ final AbstractTiffOutputItem outputItem = unplacedItems.remove(0);
final int outputItemLength = outputItem.getItemLength();
// search for the smallest possible element large enough to hold
the
// item.
@@ -260,16 +260,16 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
final Map<Long, TiffOutputField> frozenFieldOffsets = new HashMap<>();
for (final Map.Entry<Integer, TiffOutputField> entry :
frozenFields.entrySet()) {
final TiffOutputField frozenField = entry.getValue();
- if (frozenField.getSeperateValue().getOffset() !=
TiffOutputItem.UNDEFINED_VALUE) {
+ if (frozenField.getSeperateValue().getOffset() !=
AbstractTiffOutputItem.UNDEFINED_VALUE) {
frozenFieldOffsets.put(frozenField.getSeperateValue().getOffset(), frozenField);
}
}
final TiffOutputSummary outputSummary = validateDirectories(outputSet);
- final List<TiffOutputItem> allOutputItems =
outputSet.getOutputItems(outputSummary);
- final List<TiffOutputItem> outputItems = new ArrayList<>();
- for (final TiffOutputItem outputItem : allOutputItems) {
+ final List<AbstractTiffOutputItem> allOutputItems =
outputSet.getOutputItems(outputSummary);
+ final List<AbstractTiffOutputItem> outputItems = new ArrayList<>();
+ for (final AbstractTiffOutputItem outputItem : allOutputItems) {
if (!frozenFieldOffsets.containsKey(outputItem.getOffset())) {
outputItems.add(outputItem);
}
@@ -284,7 +284,7 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
}
private void writeStep(final OutputStream os, final TiffOutputSet
outputSet,
- final List<TiffElement> analysis, final List<TiffOutputItem>
outputItems,
+ final List<TiffElement> analysis, final
List<AbstractTiffOutputItem> outputItems,
final long outputLength) throws IOException, ImagingException {
final TiffOutputDirectory rootDirectory = outputSet.getRootDirectory();
@@ -306,7 +306,7 @@ public class TiffImageWriterLossless extends
TiffImageWriterBase {
}
// write in the new items
- for (final TiffOutputItem outputItem : outputItems) {
+ for (final AbstractTiffOutputItem outputItem : outputItems) {
try (BinaryOutputStream bos = BinaryOutputStream
.create(new BufferOutputStream(output, (int)
outputItem.getOffset()), byteOrder)) {
outputItem.writeItem(bos);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
index 2fa55d00..229cb380 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
@@ -36,10 +36,10 @@ public class TiffImageWriterLossy extends
TiffImageWriterBase {
super(byteOrder);
}
- private void updateOffsetsStep(final List<TiffOutputItem> outputItems) {
+ private void updateOffsetsStep(final List<AbstractTiffOutputItem>
outputItems) {
int offset = TIFF_HEADER_SIZE;
- for (final TiffOutputItem outputItem : outputItems) {
+ for (final AbstractTiffOutputItem outputItem : outputItems) {
outputItem.setOffset(offset);
final int itemLength = outputItem.getItemLength();
offset += itemLength;
@@ -54,7 +54,7 @@ public class TiffImageWriterLossy extends TiffImageWriterBase
{
throws IOException, ImagingException {
final TiffOutputSummary outputSummary = validateDirectories(outputSet);
- final List<TiffOutputItem> outputItems =
outputSet.getOutputItems(outputSummary);
+ final List<AbstractTiffOutputItem> outputItems =
outputSet.getOutputItems(outputSummary);
updateOffsetsStep(outputItems);
@@ -67,11 +67,11 @@ public class TiffImageWriterLossy extends
TiffImageWriterBase {
}
private void writeStep(final BinaryOutputStream bos,
- final List<TiffOutputItem> outputItems) throws IOException,
+ final List<AbstractTiffOutputItem> outputItems) throws IOException,
ImagingException {
writeImageFileHeader(bos);
- for (final TiffOutputItem outputItem : outputItems) {
+ for (final AbstractTiffOutputItem outputItem : outputItems) {
outputItem.writeItem(bos);
final int length = outputItem.getItemLength();
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 b72f796a..5896f3b0 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
@@ -72,7 +72,7 @@ import
org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShortOrRational;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShorts;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoXpString;
-public final class TiffOutputDirectory extends TiffOutputItem implements
Iterable<TiffOutputField> {
+public final class TiffOutputDirectory extends AbstractTiffOutputItem
implements Iterable<TiffOutputField> {
public static final Comparator<TiffOutputDirectory> COMPARATOR =
Comparator.comparingInt(TiffOutputDirectory::getType);
private final int type;
private final List<TiffOutputField> fields = new ArrayList<>();
@@ -586,7 +586,7 @@ public final class TiffOutputDirectory extends
TiffOutputItem implements Iterabl
+ TIFF_DIRECTORY_FOOTER_LENGTH;
}
- protected List<TiffOutputItem> getOutputItems(
+ protected List<AbstractTiffOutputItem> getOutputItems(
final TiffOutputSummary outputSummary) throws ImagingException {
// first validate directory fields.
@@ -655,7 +655,7 @@ public final class TiffOutputDirectory extends
TiffOutputItem implements Iterabl
imageDataInfo = new ImageDataOffsets(imageData, imageDataOffsets,
imageDataOffsetField);
}
- final List<TiffOutputItem> result = new ArrayList<>();
+ final List<AbstractTiffOutputItem> result = new ArrayList<>();
result.add(this);
sortFields();
@@ -664,7 +664,7 @@ public final class TiffOutputDirectory extends
TiffOutputItem implements Iterabl
continue;
}
- final TiffOutputItem item = field.getSeperateValue();
+ final AbstractTiffOutputItem item = field.getSeperateValue();
result.add(item);
// outputSummary.add(item, field);
}
@@ -676,7 +676,7 @@ public final class TiffOutputDirectory extends
TiffOutputItem implements Iterabl
}
if (null != jpegImageData) {
- final TiffOutputItem item = new TiffOutputItem.Value("JPEG image
data",
+ final AbstractTiffOutputItem item = new
AbstractTiffOutputItem.Value("JPEG image data",
jpegImageData.getData());
result.add(item);
outputSummary.add(item, jpegOffsetField);
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 544adcf9..ce453284 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
@@ -39,7 +39,7 @@ public class TiffOutputField {
public final FieldType fieldType;
public final int count;
private byte[] bytes;
- private final TiffOutputItem.Value separateValueItem;
+ private final AbstractTiffOutputItem.Value separateValueItem;
private int sortHint = -1;
@@ -56,7 +56,7 @@ public class TiffOutputField {
} else {
final String name = "Field Separate value (" +
tagInfo.getDescription()
+ ")";
- separateValueItem = new TiffOutputItem.Value(name, bytes);
+ separateValueItem = new AbstractTiffOutputItem.Value(name, bytes);
}
}
@@ -69,7 +69,7 @@ public class TiffOutputField {
return Arrays.equals(bytes, data);
}
- protected TiffOutputItem getSeperateValue() {
+ protected AbstractTiffOutputItem getSeperateValue() {
return separateValueItem;
}
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 2dd29bcb..4f6ffaad 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
@@ -160,9 +160,9 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
return addRootDirectory();
}
- protected List<TiffOutputItem> getOutputItems(
+ protected List<AbstractTiffOutputItem> getOutputItems(
final TiffOutputSummary outputSummary) throws ImagingException {
- final List<TiffOutputItem> result = new ArrayList<>();
+ final List<AbstractTiffOutputItem> result = new ArrayList<>();
for (final TiffOutputDirectory directory : directories) {
result.addAll(directory.getOutputItems(outputSummary));
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 7b800fe3..d6b7fa34 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
@@ -26,10 +26,10 @@ import
org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
class TiffOutputSummary {
private static class OffsetItem {
- public final TiffOutputItem item;
+ public final AbstractTiffOutputItem item;
public final TiffOutputField itemOffsetField;
- OffsetItem(final TiffOutputItem item, final TiffOutputField
itemOffsetField) {
+ OffsetItem(final AbstractTiffOutputItem item, final TiffOutputField
itemOffsetField) {
this.itemOffsetField = itemOffsetField;
this.item = item;
}
@@ -49,7 +49,7 @@ class TiffOutputSummary {
this.directoryTypeMap = directoryTypeMap;
}
- public void add(final TiffOutputItem item,
+ public void add(final AbstractTiffOutputItem item,
final TiffOutputField itemOffsetField) {
offsetItems.add(new OffsetItem(item, itemOffsetField));
}
@@ -67,7 +67,7 @@ class TiffOutputSummary {
for (final ImageDataOffsets imageDataInfo : imageDataItems) {
for (int j = 0; j < imageDataInfo.outputItems.length; j++) {
- final TiffOutputItem item = imageDataInfo.outputItems[j];
+ final AbstractTiffOutputItem item =
imageDataInfo.outputItems[j];
imageDataInfo.imageDataOffsets[j] = (int) item.getOffset();
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/tiff/write/PrintShallowSizes.java
b/src/test/java/org/apache/commons/imaging/formats/tiff/write/PrintShallowSizes.java
index d7dce7d0..de0ac154 100644
---
a/src/test/java/org/apache/commons/imaging/formats/tiff/write/PrintShallowSizes.java
+++
b/src/test/java/org/apache/commons/imaging/formats/tiff/write/PrintShallowSizes.java
@@ -22,6 +22,6 @@ import
org.apache.commons.imaging.test.PrintShallowObjectSizes;
public class PrintShallowSizes {
public static void main(final String[] args) {
- PrintShallowObjectSizes.print(TiffOutputItem.class,
TiffOutputItem.Value.class);
+ PrintShallowObjectSizes.print(AbstractTiffOutputItem.class,
AbstractTiffOutputItem.Value.class);
}
}
