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 1234dfd7ea46000b1ea0a0d324710f9c917be5b6 Author: Gary D. Gregory <[email protected]> AuthorDate: Sat Feb 22 10:53:16 2025 -0500 Use ArrayUtils --- .../commons/imaging/formats/jpeg/JpegImageParser.java | 13 ++----------- .../apache/commons/imaging/formats/psd/PsdImageParser.java | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java index cafbd5f1..9ca17038 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java @@ -61,6 +61,7 @@ import org.apache.commons.imaging.formats.tiff.TiffImageParser; import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.apache.commons.imaging.internal.Debug; +import org.apache.commons.lang3.ArrayUtils; public class JpegImageParser extends AbstractImageParser<JpegImagingParameters> implements XmpEmbeddable<JpegImagingParameters> { @@ -852,17 +853,7 @@ public class JpegImageParser extends AbstractImageParser<JpegImagingParameters> } private boolean keepMarker(final int marker, final int[] markers) { - if (markers == null) { - return true; - } - - for (final int marker2 : markers) { - if (marker2 == marker) { - return true; - } - } - - return false; + return ArrayUtils.contains(markers, marker); } public List<AbstractSegment> readSegments(final ByteSource byteSource, final int[] markers, final boolean returnAfterFirst) 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 2e4b3dc5..854a9986 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 @@ -46,6 +46,7 @@ import org.apache.commons.imaging.formats.psd.dataparsers.DataParserRgb; import org.apache.commons.imaging.formats.psd.datareaders.CompressedDataReader; import org.apache.commons.imaging.formats.psd.datareaders.DataReader; import org.apache.commons.imaging.formats.psd.datareaders.UncompressedDataReader; +import org.apache.commons.lang3.ArrayUtils; public class PsdImageParser extends AbstractImageParser<PsdImagingParameters> implements XmpEmbeddable { @@ -490,17 +491,7 @@ public class PsdImageParser extends AbstractImageParser<PsdImagingParameters> im } private boolean keepImageResourceBlock(final int id, final int[] imageResourceIDs) { - if (imageResourceIDs == null) { - return true; - } - - for (final int imageResourceID : imageResourceIDs) { - if (id == imageResourceID) { - return true; - } - } - - return false; + return ArrayUtils.contains(imageResourceIDs, id); } private PsdHeaderInfo readHeader(final ByteSource byteSource) throws ImagingException, IOException {
