You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/05/22 03:03:59 UTC
[commons-imaging] 01/03: Rename package since it is only used for TIFF
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 4d0ab2a27c66cd59287666b80d1e93fedee59c11
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 21 22:30:39 2023 -0400
Rename package since it is only used for TIFF
---
.../commons/imaging/formats/tiff/datareaders/ImageDataReader.java | 2 +-
.../imaging/{common => formats/tiff}/itu_t4/BitArrayOutputStream.java | 2 +-
.../{common => formats/tiff}/itu_t4/BitInputStreamFlexible.java | 2 +-
.../commons/imaging/{common => formats/tiff}/itu_t4/HuffmanTree.java | 2 +-
.../imaging/{common => formats/tiff}/itu_t4/T4AndT6Compression.java | 4 ++--
.../commons/imaging/{common => formats/tiff}/itu_t4/T4_T6_Tables.java | 2 +-
.../commons/imaging/{common => formats/tiff}/itu_t4/package-info.java | 2 +-
.../commons/imaging/formats/tiff/write/TiffImageWriterBase.java | 2 +-
.../java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java | 2 +-
.../{common => formats/tiff}/itu_t4/HuffmanTreeExceptionTest.java | 2 +-
.../imaging/{common => formats/tiff}/itu_t4/T4_T6_TablesTest.java | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
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 c3151156..a47f7648 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
@@ -41,13 +41,13 @@ import org.apache.commons.imaging.common.Allocator;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.ZlibDeflate;
-import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
+import org.apache.commons.imaging.formats.tiff.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
/**
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitArrayOutputStream.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitArrayOutputStream.java
similarity index 97%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/BitArrayOutputStream.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitArrayOutputStream.java
index ac0d3888..17727aeb 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitArrayOutputStream.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitArrayOutputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import java.io.OutputStream;
import java.util.Arrays;
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitInputStreamFlexible.java
similarity index 98%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitInputStreamFlexible.java
index 8fbd415d..f6fe3971 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/BitInputStreamFlexible.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/BitInputStreamFlexible.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import java.io.FilterInputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTree.java
similarity index 98%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTree.java
index 7442a483..6bd241a8 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTree.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4AndT6Compression.java
similarity index 99%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4AndT6Compression.java
index e4f7fa7b..08799c6a 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4AndT6Compression.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.Allocator;
-import org.apache.commons.imaging.common.itu_t4.T4_T6_Tables.Entry;
+import org.apache.commons.imaging.formats.tiff.itu_t4.T4_T6_Tables.Entry;
public final class T4AndT6Compression {
private static final HuffmanTree<Integer> WHITE_RUN_LENGTHS = new HuffmanTree<>();
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_Tables.java
similarity index 99%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_Tables.java
index 3036eaad..dd949c2f 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_Tables.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
class T4_T6_Tables {
public static class Entry {
diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/package-info.java b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/package-info.java
similarity index 93%
rename from src/main/java/org/apache/commons/imaging/common/itu_t4/package-info.java
rename to src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/package-info.java
index 9c1510fa..30a03ae0 100644
--- a/src/main/java/org/apache/commons/imaging/common/itu_t4/package-info.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/itu_t4/package-info.java
@@ -18,5 +18,5 @@
/**
* Provides ITU-T T.4 and T.6 compression classes.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index 7029bc59..94512b1e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -48,7 +48,6 @@ import org.apache.commons.imaging.common.BinaryOutputStream;
import org.apache.commons.imaging.common.PackBits;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.common.ZlibDeflate;
-import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
import org.apache.commons.imaging.formats.tiff.TiffElement;
import org.apache.commons.imaging.formats.tiff.TiffImageData;
@@ -56,6 +55,7 @@ import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
+import org.apache.commons.imaging.formats.tiff.itu_t4.T4AndT6Compression;
public abstract class TiffImageWriterBase {
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
index 09e43ca5..61ff6114 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
@@ -26,8 +26,8 @@ import java.io.IOException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
+import org.apache.commons.imaging.formats.tiff.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
rename to src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
index 2f258964..2f88801f 100644
--- a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/HuffmanTreeExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java
rename to src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
index 7317db25..5485ffcb 100644
--- a/src/test/java/org/apache/commons/imaging/common/itu_t4/T4_T6_TablesTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/itu_t4/T4_T6_TablesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.imaging.common.itu_t4;
+package org.apache.commons.imaging.formats.tiff.itu_t4;
import static org.junit.jupiter.api.Assertions.assertEquals;