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 640bbe2fb0334c7b67182fc35d44e0e4c962be03 Author: Arturo Bernal <arturobern...@gmail.com> AuthorDate: Wed Apr 21 14:48:16 2021 +0200 [IMAGING-290] Remove redundant local variable --- .../java/org/apache/commons/imaging/color/ColorConversions.java | 6 ++---- src/main/java/org/apache/commons/imaging/common/PackBits.java | 3 +-- .../apache/commons/imaging/common/itu_t4/T4AndT6Compression.java | 9 +++------ .../org/apache/commons/imaging/formats/bmp/BmpImageParser.java | 6 ++---- .../org/apache/commons/imaging/formats/dcx/DcxImageParser.java | 3 +-- .../org/apache/commons/imaging/formats/gif/GifImageParser.java | 3 +-- .../org/apache/commons/imaging/formats/icns/IcnsImageParser.java | 3 +-- .../org/apache/commons/imaging/formats/ico/IcoImageParser.java | 3 +-- .../org/apache/commons/imaging/formats/pcx/PcxImageParser.java | 6 ++---- .../org/apache/commons/imaging/formats/pnm/PnmImageParser.java | 3 +-- .../org/apache/commons/imaging/formats/psd/PsdImageParser.java | 6 ++---- .../org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java | 6 ++---- .../org/apache/commons/imaging/formats/tiff/TiffImageParser.java | 4 +--- .../photometricinterpreters/PhotometricInterpreterYCbCr.java | 3 +-- .../commons/imaging/formats/tiff/write/TiffImageWriterBase.java | 4 +--- .../org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java | 3 +-- .../java/org/apache/commons/imaging/icc/IccProfileParser.java | 3 +-- .../org/apache/commons/imaging/palette/ColorSpaceSubset.java | 3 +-- .../org/apache/commons/imaging/examples/ImageReadExample.java | 6 ++---- .../org/apache/commons/imaging/examples/ImageWriteExample.java | 4 +--- .../java/org/apache/commons/imaging/roundtrip/ImageAsserts.java | 3 +-- 21 files changed, 29 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java index 7a94626..45c7b71 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java @@ -571,9 +571,8 @@ public final class ColorConversions { blue = Math.min(255, Math.max(0, blue)); final int alpha = 0xff; - final int rgb = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); - return rgb; + return (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); } private static int convertRGBtoRGB(int red, int green, int blue) { @@ -582,9 +581,8 @@ public final class ColorConversions { blue = Math.min(255, Math.max(0, blue)); final int alpha = 0xff; - final int rgb = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); - return rgb; + return (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); } public static ColorCieLch convertCIELabtoCIELCH(final ColorCieLab cielab) { 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 53a538f..3869a48 100644 --- a/src/main/java/org/apache/commons/imaging/common/PackBits.java +++ b/src/main/java/org/apache/commons/imaging/common/PackBits.java @@ -148,8 +148,7 @@ public class PackBits { } } } - final byte[] result = baos.toByteArray(); - return result; + return baos.toByteArray(); } } } diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java index ddc856e..d064df6 100644 --- a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java +++ b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java @@ -160,8 +160,7 @@ public final class T4AndT6Compression { throw new ImageReadException("Unrecoverable row length error in image row " + y); } } - final byte[] ret = outputStream.toByteArray(); - return ret; + return outputStream.toByteArray(); } catch (final IOException ioException) { throw new ImageReadException("Error reading image to decompress", ioException); } @@ -238,8 +237,7 @@ public final class T4AndT6Compression { throw new ImageReadException("Unrecoverable row length error in image row " + y); } } - final byte[] ret = outputStream.toByteArray(); - return ret; + return outputStream.toByteArray(); } } @@ -518,8 +516,7 @@ public final class T4AndT6Compression { // EOFB T4_T6_Tables.EOL.writeBits(outputStream); T4_T6_Tables.EOL.writeBits(outputStream); - final byte[] ret = outputStream.toByteArray(); - return ret; + return outputStream.toByteArray(); } catch (final IOException ioException) { throw new ImageWriteException("I/O error", ioException); } diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java index 5f1c1b4..99d12e2 100644 --- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java @@ -480,8 +480,7 @@ public class BmpImageParser extends ImageParser { private BmpHeaderInfo readBmpHeaderInfo(final ByteSource byteSource) throws ImageReadException, IOException { try (InputStream is = byteSource.getInputStream()) { // readSignature(is); - final BmpHeaderInfo ret = readBmpHeaderInfo(is, null); - return ret; + return readBmpHeaderInfo(is, null); } } @@ -640,8 +639,7 @@ public class BmpImageParser extends ImageParser { public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params) throws ImageReadException, IOException { try (InputStream is = byteSource.getInputStream()) { - final BufferedImage ret = getBufferedImage(is, params); - return ret; + return getBufferedImage(is, params); } } diff --git a/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java b/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java index 98ad9a2..0d02204 100644 --- a/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java @@ -153,8 +153,7 @@ public class DcxImageParser extends ImageParser { pages[i] = ((Long) objects[i]); } - final DcxHeader ret = new DcxHeader(id, pages); - return ret; + return new DcxHeader(id, pages); } } 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 9f99dc6..04bf6cd 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 @@ -475,9 +475,8 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable { final List<GifBlock> blocks = readBlocks(ghi, is, stopBeforeImageData, formatCompliance); - final GifImageContents result = new GifImageContents(ghi, globalColorTable, + return new GifImageContents(ghi, globalColorTable, blocks); - return result; } } diff --git a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java index 080dc0c..18965f4 100644 --- a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java @@ -227,8 +227,7 @@ public class IcnsImageParser extends ImageParser { icnsElements[i] = icnsElementList.get(i); } - final IcnsContents ret = new IcnsContents(icnsHeader, icnsElements); - return ret; + return new IcnsContents(icnsHeader, icnsElements); } } diff --git a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java index c167d2c..546e497 100644 --- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java @@ -555,8 +555,7 @@ public class IcoImageParser extends ImageParser { fIconDatas[i] = readIconData(iconData, fIconInfos[i]); } - final ImageContents ret = new ImageContents(fileHeader, fIconDatas); - return ret; + return new ImageContents(fileHeader, fIconDatas); } } diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java index 5f90a8c..d370259 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java @@ -318,8 +318,7 @@ public class PcxImageParser extends ImageParser { try (InputStream stream = byteSource.getInputStream()) { final long toSkip = byteSource.getLength() - 769; skipBytes(stream, (int) toSkip); - final int[] ret = read256ColorPalette(stream); - return ret; + return read256ColorPalette(stream); } } @@ -485,8 +484,7 @@ public class PcxImageParser extends ImageParser { try (InputStream is = byteSource.getInputStream()) { final PcxHeader pcxHeader = readPcxHeader(is, isStrict); - final BufferedImage ret = readImage(pcxHeader, is, byteSource); - return ret; + return readImage(pcxHeader, is, byteSource); } } diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java index 53d2ceb..2c661a9 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java @@ -317,8 +317,7 @@ public class PnmImageParser extends ImageParser { hasAlpha); info.readImage(imageBuilder, is); - final BufferedImage ret = imageBuilder.getBufferedImage(); - return ret; + return imageBuilder.getBufferedImage(); } } 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 eea416a..d26d7fb 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 @@ -97,8 +97,7 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable { private PsdHeaderInfo readHeader(final ByteSource byteSource) throws ImageReadException, IOException { try (InputStream is = byteSource.getInputStream()) { - final PsdHeaderInfo ret = readHeader(is); - return ret; + return readHeader(is); } } @@ -247,9 +246,8 @@ public class PsdImageParser extends ImageParser implements XmpEmbeddable { resourceStream, imageContents.ImageResourcesLength, "Not a Valid PSD File"); - final List<ImageResourceBlock> ret = readImageResourceBlocks(ImageResources, imageResourceIDs, + return readImageResourceBlocks(ImageResources, imageResourceIDs, maxBlocksToRead); - return ret; } } diff --git a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java index 7d8a199..c171625 100644 --- a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java @@ -74,8 +74,7 @@ public class RgbeImageParser extends ImageParser { public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params) throws ImageReadException, IOException { try (RgbeInfo info = new RgbeInfo(byteSource)) { - final ImageMetadata ret = info.getMetadata(); - return ret; + return info.getMetadata(); } } @@ -119,8 +118,7 @@ public class RgbeImageParser extends ImageParser { public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params) throws ImageReadException, IOException { try (RgbeInfo info = new RgbeInfo(byteSource)) { - final Dimension ret = new Dimension(info.getWidth(), info.getHeight()); - return ret; + return new Dimension(info.getWidth(), info.getHeight()); } } 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 b149c11..58af805 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 @@ -302,13 +302,11 @@ public class TiffImageParser extends ImageParser implements XmpEmbeddable { break; } - final ImageInfo result = new ImageInfo(formatDetails, bitsPerPixel, comments, + return new ImageInfo(formatDetails, bitsPerPixel, comments, format, formatName, height, mimeType, numberOfImages, physicalHeightDpi, physicalHeightInch, physicalWidthDpi, physicalWidthInch, width, progressive, transparent, usesPalette, colorType, compressionAlgorithm); - - return result; } @Override diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java index 9b3ec33..f1c5dca 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java @@ -60,8 +60,7 @@ public class PhotometricInterpreterYCbCr extends PhotometricInterpreter { final int b = limit((int) b1, 0, 255); final int alpha = 0xff; - final int rgb = (alpha << 24) | (r << 16) | (g << 8) | (b << 0); - return rgb; + return (alpha << 24) | (r << 16) | (g << 8) | (b << 0); } @Override 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 ce09074..adb9deb 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 @@ -701,9 +701,7 @@ public abstract class TiffImageWriterBase { protected void writeImageFileHeader(final BinaryOutputStream bos) throws IOException { - final int offsetToFirstIFD = TIFF_HEADER_SIZE; - - writeImageFileHeader(bos, offsetToFirstIFD); + writeImageFileHeader(bos, TIFF_HEADER_SIZE); } protected void writeImageFileHeader(final BinaryOutputStream bos, diff --git a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java index 3a774dc..343d806 100644 --- a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java @@ -211,8 +211,7 @@ public class WbmpImageParser extends ImageParser { final Map<String, Object> params) throws ImageReadException, IOException { try (InputStream is = byteSource.getInputStream()) { final WbmpHeader wbmpHeader = readWbmpHeader(is); - final BufferedImage ret = readImage(wbmpHeader, is); - return ret; + return readImage(wbmpHeader, is); } } diff --git a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java index efbafc6..dd8143d 100644 --- a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java +++ b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java @@ -324,8 +324,7 @@ public class IccProfileParser extends BinaryFileParser { printCharQuad("DeviceModel", deviceModel); } - final boolean result = deviceManufacturer == IccConstants.IEC && deviceModel == IccConstants.sRGB; - return result; + return deviceManufacturer == IccConstants.IEC && deviceModel == IccConstants.sRGB; } } diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java b/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java index e4e32c1..ea2a74c 100644 --- a/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java +++ b/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java @@ -128,9 +128,8 @@ class ColorSpaceSubset { final int rdiff = maxs[0] - mins[0] + 1; final int gdiff = maxs[1] - mins[1] + 1; final int bdiff = maxs[2] - mins[2] + 1; - final int colorArea = rdiff * gdiff * bdiff; - return colorArea; + return rdiff * gdiff * bdiff; } diff --git a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java index d94d0cf..6090151 100644 --- a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java +++ b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java @@ -42,10 +42,8 @@ public class ImageReadExample { // params.put(ImagingConstants.PARAM_KEY_VERBOSE, Boolean.TRUE); - // read image - final BufferedImage image = Imaging.getBufferedImage(file, params); - - return image; + // read and return the image + return Imaging.getBufferedImage(file, params); } public static class ManagedImageBufferedImageFactory implements diff --git a/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java b/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java index 31b1eed..e94c75b 100644 --- a/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java +++ b/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java @@ -43,9 +43,7 @@ public class ImageWriteExample { params.put(ImagingConstants.PARAM_KEY_COMPRESSION, Integer.valueOf( TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED)); - final byte[] bytes = Imaging.writeImageToBytes(image, format, params); - - return bytes; + return Imaging.writeImageToBytes(image, format, params); } } diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/ImageAsserts.java b/src/test/java/org/apache/commons/imaging/roundtrip/ImageAsserts.java index cd43c64..14b77e1 100644 --- a/src/test/java/org/apache/commons/imaging/roundtrip/ImageAsserts.java +++ b/src/test/java/org/apache/commons/imaging/roundtrip/ImageAsserts.java @@ -72,9 +72,8 @@ final class ImageAsserts { final int bRed = 0xff & (b >> 16); final int bGreen = 0xff & (b >> 8); final int bBlue = 0xff & (b >> 0); - final int diff = Math.abs(aAlpha - bAlpha) + Math.abs(aRed - bRed) + return Math.abs(aAlpha - bAlpha) + Math.abs(aRed - bRed) + Math.abs(aGreen - bGreen) + Math.abs(aBlue - bBlue); - return diff; }