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
commit b2f25586811f6112d9af112dc902cc6bd26befa9 Author: Gary Gregory <[email protected]> AuthorDate: Mon May 15 17:44:54 2023 -0400 Refactor for constants --- .../java/org/apache/commons/imaging/formats/jpeg/decoder/Block.java | 1 + .../org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java | 2 +- .../apache/commons/imaging/formats/tiff/write/ImageDataOffsets.java | 2 +- .../org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java | 3 +++ src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java | 2 +- src/main/java/org/apache/commons/imaging/icc/IccTag.java | 1 + .../apache/commons/imaging/formats/tiff/write/PrintShallowSizes.java | 2 +- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Block.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Block.java index e84386a1..0d39c739 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Block.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Block.java @@ -18,6 +18,7 @@ package org.apache.commons.imaging.formats.jpeg.decoder; import org.apache.commons.imaging.common.Allocator; final class Block { + static final int SHALLOW_SIZE = 24; final int[] samples; final int width; diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java index b4f5d0ef..603e6a09 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java @@ -142,7 +142,7 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor { private final float[] block = new float[64]; private Block[] allocateMCUMemory() throws ImagingException { - final Block[] mcu = Allocator.array(sosSegment.numberOfComponents, Block[]::new, 24); + final Block[] mcu = Allocator.array(sosSegment.numberOfComponents, Block[]::new, Block.SHALLOW_SIZE); for (int i = 0; i < sosSegment.numberOfComponents; i++) { final SosSegment.Component scanComponent = sosSegment.getComponents(i); SofnSegment.Component frameComponent = null; 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 bc1f24e5..c227bd13 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 @@ -30,7 +30,7 @@ class ImageDataOffsets { this.imageDataOffsets = imageDataOffsets; this.imageDataOffsetsField = imageDataOffsetsField; - outputItems = Allocator.array(imageData.length, TiffOutputItem[]::new, 24); + outputItems = Allocator.array(imageData.length, TiffOutputItem[]::new, TiffOutputItem.Value.SHALLOW_SIZE); Arrays.setAll(outputItems, i -> new TiffOutputItem.Value("TIFF image data", imageData[i].getData())); } 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/TiffOutputItem.java index f92a7633..316b3920 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/TiffOutputItem.java @@ -22,7 +22,10 @@ import org.apache.commons.imaging.ImagingException; import org.apache.commons.imaging.common.BinaryOutputStream; abstract class TiffOutputItem { + public static class Value extends TiffOutputItem { + + static final int SHALLOW_SIZE = 32; private final byte[] bytes; private final String name; diff --git a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java index 68d3356d..c31d9dc4 100644 --- a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java +++ b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java @@ -244,7 +244,7 @@ public class IccProfileParser extends BinaryFileParser { final int tagCount = read4Bytes("TagCount", is, "Not a Valid ICC Profile", getByteOrder()); // List tags = new ArrayList(); - final IccTag[] tags = Allocator.array(tagCount, IccTag[]::new, 40); + final IccTag[] tags = Allocator.array(tagCount, IccTag[]::new, IccTag.SHALLOW_SIZE); for (int i = 0; i < tagCount; i++) { final int tagSignature = read4Bytes("TagSignature[" + i + "]", is, "Not a Valid ICC Profile", diff --git a/src/main/java/org/apache/commons/imaging/icc/IccTag.java b/src/main/java/org/apache/commons/imaging/icc/IccTag.java index 32877a6b..712470f0 100644 --- a/src/main/java/org/apache/commons/imaging/icc/IccTag.java +++ b/src/main/java/org/apache/commons/imaging/icc/IccTag.java @@ -31,6 +31,7 @@ import org.apache.commons.imaging.common.BinaryFunctions; public class IccTag { + static final int SHALLOW_SIZE = 40; private static final Logger LOGGER = Logger.getLogger(IccTag.class.getName()); public final int signature; 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 23fc8e3f..18fdef84 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.util.PrintShallowObjectSizes; public class PrintShallowSizes { public static void main(final String[] args) { - PrintShallowObjectSizes.print(TiffOutputItem.class); + PrintShallowObjectSizes.print(TiffOutputItem.class, TiffOutputItem.Value.class); } }
