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 48fce3e05af5047b92b85c261671415f12de2227 Author: Gary Gregory <[email protected]> AuthorDate: Sun May 14 09:53:55 2023 -0400 Use generics --- .../org/apache/commons/imaging/formats/gif/GifImageParser.java | 7 +++---- .../org/apache/commons/imaging/formats/jpeg/JpegImageParser.java | 4 ++-- .../org/apache/commons/imaging/formats/png/PngImageParser.java | 4 ++-- .../org/apache/commons/imaging/formats/psd/PsdImageParser.java | 2 +- .../org/apache/commons/imaging/formats/tiff/TiffImageParser.java | 6 +++--- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java index 795c51cf..30ee7bc8 100644 --- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java @@ -56,7 +56,7 @@ import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor; import org.apache.commons.imaging.palette.Palette; import org.apache.commons.imaging.palette.PaletteFactory; -public class GifImageParser extends ImageParser<GifImagingParameters> implements XmpEmbeddable { +public class GifImageParser extends ImageParser<GifImagingParameters> implements XmpEmbeddable<GifImagingParameters> { private static final Logger LOGGER = Logger.getLogger(GifImageParser.class.getName()); @@ -71,8 +71,7 @@ public class GifImageParser extends ImageParser<GifImagingParameters> implements private static final int XMP_EXTENSION = 0xff; private static final int TERMINATOR_BYTE = 0x3b; private static final int APPLICATION_EXTENSION_LABEL = 0xff; - private static final int XMP_COMPLETE_CODE = (EXTENSION_CODE << 8) - | XMP_EXTENSION; + private static final int XMP_COMPLETE_CODE = (EXTENSION_CODE << 8) | XMP_EXTENSION; private static final int LOCAL_COLOR_TABLE_FLAG_MASK = 1 << 7; private static final int INTERLACE_FLAG_MASK = 1 << 6; private static final int SORT_FLAG_MASK = 1 << 5; @@ -516,7 +515,7 @@ public class GifImageParser extends ImageParser<GifImagingParameters> implements * @return Xmp Xml as String, if present. Otherwise, returns null. */ @Override - public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters params) + public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters<GifImagingParameters> params) throws ImageReadException, IOException { try (InputStream is = byteSource.getInputStream()) { final GifHeaderInfo ghi = readHeader(is, null); diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java index c6cc3c94..0b2c4a6d 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java @@ -63,7 +63,7 @@ import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.apache.commons.imaging.internal.Debug; -public class JpegImageParser extends ImageParser<JpegImagingParameters> implements XmpEmbeddable { +public class JpegImageParser extends ImageParser<JpegImagingParameters> implements XmpEmbeddable<JpegImagingParameters> { private static final Logger LOGGER = Logger.getLogger(JpegImageParser.class.getName()); @@ -748,7 +748,7 @@ public class JpegImageParser extends ImageParser<JpegImagingParameters> implemen * @return Xmp Xml as String, if present. Otherwise, returns null. */ @Override - public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters params) + public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters<JpegImagingParameters> params) throws ImageReadException, IOException { final List<String> result = new ArrayList<>(); diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java index 39a60f4d..8948e8bb 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java @@ -71,7 +71,7 @@ import org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFi import org.apache.commons.imaging.formats.png.transparencyfilters.TransparencyFilterTrueColor; import org.apache.commons.imaging.icc.IccProfileParser; -public class PngImageParser extends ImageParser<PngImagingParameters> implements XmpEmbeddable { +public class PngImageParser extends ImageParser<PngImagingParameters> implements XmpEmbeddable<PngImagingParameters> { private static final Logger LOGGER = Logger.getLogger(PngImageParser.class.getName()); @@ -587,7 +587,7 @@ public class PngImageParser extends ImageParser<PngImagingParameters> implement } @Override - public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters params) + public String getXmpXml(final ByteSource byteSource, final XmpImagingParameters<PngImagingParameters> params) throws ImageReadException, IOException { final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.iTXt }, false); diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java index 6347fbca..69ee873e 100644 --- a/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java @@ -55,6 +55,7 @@ import org.apache.commons.imaging.formats.psd.datareaders.DataReader; import org.apache.commons.imaging.formats.psd.datareaders.UncompressedDataReader; public class PsdImageParser extends ImageParser<PsdImagingParameters> implements XmpEmbeddable { + private static final String DEFAULT_EXTENSION = ImageFormats.PSD.getDefaultExtension(); private static final String[] ACCEPTED_EXTENSIONS = ImageFormats.PSD.getExtensions(); private static final int PSD_SECTION_HEADER = 0; @@ -488,7 +489,6 @@ public class PsdImageParser extends ImageParser<PsdImagingParameters> implements /** * Extracts embedded XML metadata as XML string. - * <p> * * @param byteSource * File containing image data. 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 26aa5068..7dea294a 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 @@ -64,7 +64,7 @@ import org.apache.commons.imaging.formats.tiff.photometricinterpreters.Photometr import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterYCbCr; import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; -public class TiffImageParser extends ImageParser<TiffImagingParameters> implements XmpEmbeddable { +public class TiffImageParser extends ImageParser<TiffImagingParameters> implements XmpEmbeddable<TiffImagingParameters> { private static final String DEFAULT_EXTENSION = ImageFormats.TIFF.getDefaultExtension(); private static final String[] ACCEPTED_EXTENSIONS = ImageFormats.TIFF.getExtensions(); @@ -916,10 +916,10 @@ public class TiffImageParser extends ImageParser<TiffImagingParameters> implemen } @Override - public String getXmpXml(final ByteSource byteSource, XmpImagingParameters params) + public String getXmpXml(final ByteSource byteSource, XmpImagingParameters<TiffImagingParameters> params) throws ImageReadException, IOException { if (params == null) { - params = new XmpImagingParameters(); + params = new XmpImagingParameters<>(); } final FormatCompliance formatCompliance = FormatCompliance.getDefault(); final TiffContents contents = new TiffReader(params.isStrict()).readDirectories(
