This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit d9c1a0b7f37f39bf2efa5b61a2464bdf0a96b5c6
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu Jul 15 17:15:54 2021 +1200
[IMAGING-159] Remove unused code
---
.../apache/commons/imaging/ImagingConstants.java | 26 ----------------------
.../imaging/formats/tiff/TiffCompression.java | 22 ------------------
.../imaging/formats/tiff/TiffImageParser.java | 8 +------
3 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/ImagingConstants.java
b/src/main/java/org/apache/commons/imaging/ImagingConstants.java
index d2b48e7..44c3089 100644
--- a/src/main/java/org/apache/commons/imaging/ImagingConstants.java
+++ b/src/main/java/org/apache/commons/imaging/ImagingConstants.java
@@ -26,32 +26,6 @@ package org.apache.commons.imaging;
public final class ImagingConstants {
/**
- * <p>Parameter key. Used in write operations to indicate desired
compression
- * algorithm.</p>
- *
- * <p>Currently only applies to writing TIFF image files.</p>
- *
- * <p>Valid values: {@code TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED,
- * TiffConstants.TIFF_COMPRESSION_CCITT_1D,
- * TiffConstants.TIFF_COMPRESSION_LZW,
- * TiffConstants.TIFF_COMPRESSION_PACKBITS.}</p>
- *
- * @see org.apache.commons.imaging.formats.tiff.constants.TiffConstants
- */
- public static final String PARAM_KEY_COMPRESSION = "COMPRESSION";
-
- /**
- * <p>Parameter key. Indicates whether to throw exceptions when parsing
invalid
- * files, or whether to tolerate small problems.</p>
- *
- * <p>Valid values: {@code Boolean.TRUE} and {@code Boolean.FALSE}.
Default value:
- * {@code Boolean.FALSE}.</p>
- *
- * @see org.apache.commons.imaging.formats.tiff.constants.TiffConstants
- */
- public static final String PARAM_KEY_STRICT = "STRICT";
-
- /**
* Empty byte array.
*/
public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffCompression.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffCompression.java
deleted file mode 100644
index 3db2290..0000000
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffCompression.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.imaging.formats.tiff;
-
-public enum TiffCompression {
-
-}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index 3faf96e..45fd84f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -768,15 +768,9 @@ public class TiffImageParser extends
ImageParser<TiffImagingParameters> implemen
* Reads the content of a TIFF file that contains numerical data samples
* rather than image-related pixels.
* <p>
-<<<<<<< HEAD
* If desired, sub-image data can be read from the file by using a Java
- * {@code Map} instance to specify the subsection of the image that
+ * {@code TiffImagingParameters} instance to specify the subsection of the
image that
* is required. The following code illustrates the approach:
-=======
- * If desired, sub-image data can be read from the file by using an {@code
TiffImagingParameters}
- * instance to specify the subsection of the image that is required. The
- * following code illustrates the approach:
->>>>>>> [IMAGING-159] Use ImagingParameters and define new classes as needed
for other formats
* <pre>
* int x; // coordinate (column) of corner of sub-image
* int y; // coordinate (row) of corner of sub-image
