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 8eea83e3 Make PackBits methods static
new 7e6c6c3f Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-imaging.git
8eea83e3 is described below
commit 8eea83e30f6451bdc1bda922316ed6d3df72e46a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jan 26 19:26:21 2024 -0500
Make PackBits methods static
---
.../java/org/apache/commons/imaging/common/PackBits.java | 12 ++++++++----
.../formats/psd/datareaders/CompressedDataReader.java | 2 +-
.../imaging/formats/tiff/datareaders/ImageDataReader.java | 2 +-
.../imaging/formats/tiff/write/AbstractTiffImageWriter.java | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/common/PackBits.java
b/src/main/java/org/apache/commons/imaging/common/PackBits.java
index 3faaca22..e8507f18 100644
--- a/src/main/java/org/apache/commons/imaging/common/PackBits.java
+++ b/src/main/java/org/apache/commons/imaging/common/PackBits.java
@@ -24,7 +24,7 @@ import
org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
public class PackBits {
- public byte[] compress(final byte[] bytes) throws IOException {
+ public static byte[] compress(final byte[] bytes) throws IOException {
// max length 1 extra byte for every 128
try (UnsynchronizedByteArrayOutputStream baos =
UnsynchronizedByteArrayOutputStream.builder().setBufferSize(Allocator.checkByteArray(bytes.length
* 2))
.get()) {
@@ -73,7 +73,7 @@ public class PackBits {
}
}
- public byte[] decompress(final byte[] bytes, final int expected) throws
ImagingException {
+ public static byte[] decompress(final byte[] bytes, final int expected)
throws ImagingException {
int total = 0;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -117,7 +117,7 @@ public class PackBits {
}
- private int findNextDuplicate(final byte[] bytes, final int start) {
+ private static int findNextDuplicate(final byte[] bytes, final int start) {
// int last = -1;
if (start >= bytes.length) {
return -1;
@@ -138,7 +138,7 @@ public class PackBits {
return -1;
}
- private int findRunLength(final byte[] bytes, final int start) {
+ private static int findRunLength(final byte[] bytes, final int start) {
final byte b = bytes[start];
int i;
@@ -149,4 +149,8 @@ public class PackBits {
return i - start;
}
+
+ private PackBits() {
+ // empty
+ }
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
index e1b015ee..88710c7f 100644
---
a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
+++
b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
@@ -67,7 +67,7 @@ public class CompressedDataReader implements DataReader {
final int index = channel * height + y;
final byte[] packed = BinaryFunctions.readBytes("scanline",
is, scanlineByteCounts[index], "PSD: Missing Image Data");
- final byte[] unpacked = new PackBits().decompress(packed,
width);
+ final byte[] unpacked = PackBits.decompress(packed, width);
try (InputStream bais = new ByteArrayInputStream(unpacked);
MyBitInputStream mbis = new MyBitInputStream(bais,
ByteOrder.BIG_ENDIAN, false)) {
// we want all samples to be bytes
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
index 0f5df0f2..e7454e4c 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java
@@ -260,7 +260,7 @@ public abstract class ImageDataReader {
// Packbits
case TIFF_COMPRESSION_PACKBITS: {
- return new PackBits().decompress(compressedOrdered, expectedSize);
+ return PackBits.decompress(compressedOrdered, expectedSize);
}
// deflate
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
index 4f20681f..f762bcb4 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
@@ -486,7 +486,7 @@ public abstract class AbstractTiffImageWriter {
}
case TIFF_COMPRESSION_PACKBITS:
for (int i = 0; i < strips.length; i++) {
- strips[i] = new PackBits().compress(strips[i]);
+ strips[i] = PackBits.compress(strips[i]);
}
break;
case TIFF_COMPRESSION_LZW:
