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 835a9601ebe70bfc0cb400468fd5c086a11a589c Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Wed May 31 18:11:21 2023 -0400 Rename method --- src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java | 2 +- src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java | 4 ++-- .../org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java | 2 +- .../org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java | 2 +- .../org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java b/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java index 1d8bffb5..cc831d5b 100644 --- a/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java +++ b/src/main/java/org/apache/commons/imaging/common/BinaryFunctions.java @@ -91,7 +91,7 @@ public final class BinaryFunctions { } - public static byte[] getStreamBytes(final InputStream is) throws IOException { + public static byte[] toByteArray(final InputStream is) throws IOException { return IOUtils.toByteArray(is); } diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java index 7714ba19..a071dfbb 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java @@ -16,7 +16,7 @@ */ package org.apache.commons.imaging.formats.jpeg; -import static org.apache.commons.imaging.common.BinaryFunctions.getStreamBytes; +import static org.apache.commons.imaging.common.BinaryFunctions.toByteArray; import static org.apache.commons.imaging.common.BinaryFunctions.readAndVerifyBytes; import static org.apache.commons.imaging.common.BinaryFunctions.readByte; import static org.apache.commons.imaging.common.BinaryFunctions.readBytes; @@ -180,7 +180,7 @@ public class JpegUtils extends BinaryFileParser { return; } - final byte[] imageData = getStreamBytes(is); + final byte[] imageData = toByteArray(is); visitor.visitSOS(marker, markerBytes, imageData); break; } diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java index eef3a133..a0461b79 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java @@ -92,7 +92,7 @@ public class PngChunkIccp extends PngChunk { LOGGER.finest("bytes.length: " + bytes.length); } - uncompressedProfile = BinaryFunctions.getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(compressedProfile))); + uncompressedProfile = BinaryFunctions.toByteArray(new InflaterInputStream(new ByteArrayInputStream(compressedProfile))); if (LOGGER.isLoggable(Level.FINEST)) { LOGGER.finest("UncompressedProfile: " + bytes.length); diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java index 9f2abfba..80baca8c 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java @@ -79,7 +79,7 @@ public class PngChunkItxt extends PngTextChunk { final byte[] compressedText = Allocator.byteArray(compressedTextLength); System.arraycopy(bytes, index, compressedText, 0, compressedTextLength); - text = new String(BinaryFunctions.getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(compressedText))), StandardCharsets.UTF_8); + text = new String(BinaryFunctions.toByteArray(new InflaterInputStream(new ByteArrayInputStream(compressedText))), StandardCharsets.UTF_8); } else { text = new String(bytes, index, bytes.length - index, StandardCharsets.UTF_8); diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java index 2dbf102a..093dd5b0 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java @@ -48,7 +48,7 @@ public class PngChunkZtxt extends PngTextChunk { final byte[] compressedText = Allocator.byteArray(compressedTextLength); System.arraycopy(bytes, index, compressedText, 0, compressedTextLength); - text = new String(BinaryFunctions.getStreamBytes(new InflaterInputStream(new ByteArrayInputStream(compressedText))), StandardCharsets.ISO_8859_1); + text = new String(BinaryFunctions.toByteArray(new InflaterInputStream(new ByteArrayInputStream(compressedText))), StandardCharsets.ISO_8859_1); } @Override