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 561945def97fc7ef95e69c2ced65662109c8937b
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu Jul 29 17:46:48 2021 +1200
[IMAGING-159] Remove formats from parameters (the parsers already know,
thanks @darkma773r)
---
src/main/java/org/apache/commons/imaging/Imaging.java | 2 +-
.../org/apache/commons/imaging/ImagingParameters.java | 19 -------------------
.../commons/imaging/common/XmpImagingParameters.java | 5 -----
.../imaging/formats/bmp/BmpImagingParameters.java | 8 +-------
.../imaging/formats/gif/GifImagingParameters.java | 8 +-------
.../imaging/formats/icns/IcnsImagingParameters.java | 8 +-------
.../imaging/formats/ico/IcoImagingParameters.java | 8 +-------
.../imaging/formats/jpeg/JpegImagingParameters.java | 8 +-------
.../imaging/formats/pcx/PcxImagingParameters.java | 5 -----
.../imaging/formats/png/PngImagingParameters.java | 5 -----
.../imaging/formats/pnm/PnmImagingParameters.java | 4 ----
.../imaging/formats/psd/PsdImagingParameters.java | 8 +-------
.../imaging/formats/rgbe/RgbeImagingParameters.java | 8 +-------
.../imaging/formats/tiff/TiffImagingParameters.java | 10 ----------
.../imaging/formats/wbmp/WbmpImagingParameters.java | 8 +-------
.../imaging/formats/xbm/XbmImagingParameters.java | 8 +-------
.../imaging/formats/xpm/XpmImagingParameters.java | 9 +--------
17 files changed, 11 insertions(+), 120 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/Imaging.java
b/src/main/java/org/apache/commons/imaging/Imaging.java
index aaac462..b529588 100644
--- a/src/main/java/org/apache/commons/imaging/Imaging.java
+++ b/src/main/java/org/apache/commons/imaging/Imaging.java
@@ -954,7 +954,7 @@ public final class Imaging {
*/
public static String getXmpXml(final File file) throws ImageReadException,
IOException {
- return getXmpXml(file, new
XmpImagingParameters(Imaging.guessFormat(file)));
+ return getXmpXml(file, new XmpImagingParameters());
}
/**
diff --git a/src/main/java/org/apache/commons/imaging/ImagingParameters.java
b/src/main/java/org/apache/commons/imaging/ImagingParameters.java
index c3c130e..57151b8 100644
--- a/src/main/java/org/apache/commons/imaging/ImagingParameters.java
+++ b/src/main/java/org/apache/commons/imaging/ImagingParameters.java
@@ -29,17 +29,6 @@ import
org.apache.commons.imaging.common.BufferedImageFactory;
public class ImagingParameters {
/**
- * Image format used in write operations to indicate desired image format.
- * Default is {@code null}.
- *
- * <p>Valid values: Any format defined in ImageFormat, such as
- * ImageFormat.IMAGE_FORMAT_PNG.</p>
- *
- * @see org.apache.commons.imaging.ImageFormats
- */
- private final ImageFormat imageFormat;
-
- /**
* Whether to throw an exception when any issue occurs during reading
* or writing a file format. Default is {@code false}.
*/
@@ -89,10 +78,6 @@ public class ImagingParameters {
this.bufferedImageFactory = bufferedImageFactory;
}
- public ImageFormat getImageFormat() {
- return imageFormat;
- }
-
public PixelDensity getPixelDensity() {
return pixelDensity;
}
@@ -100,8 +85,4 @@ public class ImagingParameters {
public void setPixelDensity(PixelDensity pixelDensity) {
this.pixelDensity = pixelDensity;
}
-
- protected ImagingParameters(final ImageFormat imageFormat) {
- this.imageFormat = imageFormat;
- }
}
diff --git
a/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
b/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
index 597d5d4..3352274 100644
--- a/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
+++ b/src/main/java/org/apache/commons/imaging/common/XmpImagingParameters.java
@@ -17,7 +17,6 @@
package org.apache.commons.imaging.common;
-import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImagingParameters;
/**
@@ -26,10 +25,6 @@ import org.apache.commons.imaging.ImagingParameters;
*/
public class XmpImagingParameters extends ImagingParameters {
- public XmpImagingParameters(ImageFormat imageFormat) {
- super(imageFormat);
- }
-
private String xmpXml;
public String getXmpXml() {
diff --git
a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImagingParameters.java
index 9a523df..73cc803 100644
---
a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImagingParameters.java
@@ -17,16 +17,10 @@
package org.apache.commons.imaging.formats.bmp;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Bmp format parameters.
* @since 1.0-alpha3
*/
-public class BmpImagingParameters extends ImagingParameters {
-
- public BmpImagingParameters() {
- super(ImageFormats.BMP);
- }
-}
+public class BmpImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
index 68bfdab..3a8490a 100644
---
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImagingParameters.java
@@ -17,16 +17,10 @@
package org.apache.commons.imaging.formats.gif;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.common.XmpImagingParameters;
/**
* Gif format parameters.
* @since 1.0-alpha3
*/
-public class GifImagingParameters extends XmpImagingParameters {
-
- public GifImagingParameters() {
- super(ImageFormats.GIF);
- }
-}
+public class GifImagingParameters extends XmpImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImagingParameters.java
index 568c030..c0475f8 100644
---
a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.icns;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Icns format parameters.
* @since 1.0-alpha3
*/
-public class IcnsImagingParameters extends ImagingParameters {
-
- public IcnsImagingParameters() {
- super(ImageFormats.ICNS);
- }
-}
+public class IcnsImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImagingParameters.java
index 4c9bebc..0ac95c8 100644
---
a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.ico;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Ico format parameters.
* @since 1.0-alpha3
*/
-public class IcoImagingParameters extends ImagingParameters {
-
- public IcoImagingParameters () {
- super(ImageFormats.ICO);
- }
-}
+public class IcoImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
index 549aa61..4836b88 100644
---
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.jpeg;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
/**
* Jpeg format parameters.
* @since 1.0-alpha3
*/
-public class JpegImagingParameters extends TiffImagingParameters {
-
- public JpegImagingParameters() {
- super(ImageFormats.JPEG);
- }
-}
+public class JpegImagingParameters extends TiffImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImagingParameters.java
index 76f8bc5..4fdfa6f 100644
---
a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImagingParameters.java
@@ -15,7 +15,6 @@
package org.apache.commons.imaging.formats.pcx;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
@@ -28,10 +27,6 @@ public class PcxImagingParameters extends ImagingParameters {
private int bitDepth = -1;
private int compression = PcxConstants.PCX_COMPRESSION_UNCOMPRESSED;
- public PcxImagingParameters() {
- super(ImageFormats.PCX);
- }
-
public int getPlanes() {
return planes;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/png/PngImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/png/PngImagingParameters.java
index f267813..7c8ca1b 100644
---
a/src/main/java/org/apache/commons/imaging/formats/png/PngImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/png/PngImagingParameters.java
@@ -18,7 +18,6 @@ package org.apache.commons.imaging.formats.png;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.common.XmpImagingParameters;
/**
@@ -54,10 +53,6 @@ public class PngImagingParameters extends
XmpImagingParameters {
*/
private List<? extends PngText> textChunks = null;
- public PngImagingParameters() {
- super(ImageFormats.PNG);
- }
-
public byte getBitDepth() {
return bitDepth;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImagingParameters.java
index 2b06526..68f1e7c 100644
---
a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImagingParameters.java
@@ -31,10 +31,6 @@ public class PnmImagingParameters extends ImagingParameters {
*/
private ImageFormats subtype = null;
- public PnmImagingParameters() {
- super(ImageFormats.PNM);
- }
-
public boolean isRawBits() {
return rawBits;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImagingParameters.java
index 3ba9306..d2889a7 100644
---
a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImagingParameters.java
@@ -17,16 +17,10 @@
package org.apache.commons.imaging.formats.psd;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Psd format parameters.
* @since 1.0-alpha3
*/
-public class PsdImagingParameters extends ImagingParameters {
-
- public PsdImagingParameters() {
- super(ImageFormats.PSD);
- }
-}
+public class PsdImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImagingParameters.java
index c40ed47..09d8cf5 100644
---
a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.rgbe;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Rgbe format parameters.
* @since 1.0-alpha3
*/
-public class RgbeImagingParameters extends ImagingParameters {
-
- public RgbeImagingParameters() {
- super(ImageFormats.RGBE);
- }
-}
+public class RgbeImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
index e0ecb1a..b0d83c0 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImagingParameters.java
@@ -15,8 +15,6 @@
package org.apache.commons.imaging.formats.tiff;
-import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.common.XmpImagingParameters;
import
org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
@@ -100,14 +98,6 @@ public class TiffImagingParameters extends
XmpImagingParameters {
*/
private Integer t6Options = null;
- public TiffImagingParameters() {
- super(ImageFormats.TIFF);
- }
-
- public TiffImagingParameters(ImageFormat imageFormat) {
- super(imageFormat);
- }
-
public boolean isReadThumbnails() {
return readThumbnails;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImagingParameters.java
index 4876028..f74f28e 100644
---
a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.wbmp;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Wbmp format parameters.
* @since 1.0-alpha3
*/
-public class WbmpImagingParameters extends ImagingParameters {
-
- public WbmpImagingParameters() {
- super(ImageFormats.WBMP);
- }
-}
+public class WbmpImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImagingParameters.java
index 7128b3c..b0daa35 100644
---
a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImagingParameters.java
@@ -15,16 +15,10 @@
package org.apache.commons.imaging.formats.xbm;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Xbm format parameters.
* @since 1.0-alpha3
*/
-public class XbmImagingParameters extends ImagingParameters {
-
- public XbmImagingParameters() {
- super(ImageFormats.XBM);
- }
-}
+public class XbmImagingParameters extends ImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImagingParameters.java
index 6f4ed4c..36be857 100644
---
a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImagingParameters.java
@@ -14,17 +14,10 @@
package org.apache.commons.imaging.formats.xpm;
-import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImagingParameters;
/**
* Xpm format parameters.
* @since 1.0-alpha3
*/
-public class XpmImagingParameters extends ImagingParameters {
-
- public XpmImagingParameters() {
- super(ImageFormats.XPM);
- }
-
-}
+public class XpmImagingParameters extends ImagingParameters {}
