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 78413503e38b97a6c7b96e3f5e6597b12fa1c06b Author: Gary Gregory <[email protected]> AuthorDate: Mon May 15 19:30:50 2023 -0400 Refactor for constants --- .../java/org/apache/commons/imaging/formats/ico/IcoImageParser.java | 6 ++++-- .../org/apache/commons/imaging/formats/ico/PrintShallowSizes.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java index 80616065..86cf221a 100644 --- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java @@ -141,7 +141,9 @@ public class IcoImageParser extends ImageParser<IcoImagingParameters> { } } - private abstract static class IconData { + abstract static class IconData { + static final int SHALLOW_SIZE = 16; + public final IconInfo iconInfo; IconData(final IconInfo iconInfo) { @@ -585,7 +587,7 @@ public class IcoImageParser extends ImageParser<IcoImagingParameters> { fIconInfos[i] = readIconInfo(is); } - final IconData[] fIconDatas = Allocator.array(fileHeader.iconCount, IconData[]::new, 32); + final IconData[] fIconDatas = Allocator.array(fileHeader.iconCount, IconData[]::new, IconData.SHALLOW_SIZE); for (int i = 0; i < fileHeader.iconCount; i++) { final byte[] iconData = byteSource.getBlock( fIconInfos[i].imageOffset, fIconInfos[i].imageSize); diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/PrintShallowSizes.java b/src/test/java/org/apache/commons/imaging/formats/ico/PrintShallowSizes.java index cdfc6fb2..19f362a4 100644 --- a/src/test/java/org/apache/commons/imaging/formats/ico/PrintShallowSizes.java +++ b/src/test/java/org/apache/commons/imaging/formats/ico/PrintShallowSizes.java @@ -17,12 +17,13 @@ package org.apache.commons.imaging.formats.ico; +import org.apache.commons.imaging.formats.ico.IcoImageParser.IconData; import org.apache.commons.imaging.formats.ico.IcoImageParser.IconInfo; import org.apache.commons.imaging.test.util.PrintShallowObjectSizes; public class PrintShallowSizes { public static void main(final String[] args) { - PrintShallowObjectSizes.print(IconInfo.class); + PrintShallowObjectSizes.print(IconInfo.class, IconData.class); } }
