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 2024/02/04 18:48:42 UTC
(commons-imaging) branch master updated: Remove variable assignment just before returning it
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
The following commit(s) were added to refs/heads/master by this push:
new 8b6aa2fd Remove variable assignment just before returning it
8b6aa2fd is described below
commit 8b6aa2fd53c3a4ec6a5cbcb04a351c16cba9df26
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 4 13:48:37 2024 -0500
Remove variable assignment just before returning it
---
src/main/java/org/apache/commons/imaging/ColorTools.java | 16 +++++-----------
.../org/apache/commons/imaging/color/ColorCieLab.java | 3 +--
.../org/apache/commons/imaging/color/ColorCieLch.java | 3 +--
.../org/apache/commons/imaging/color/ColorCieLuv.java | 3 +--
.../java/org/apache/commons/imaging/color/ColorCmy.java | 3 +--
.../java/org/apache/commons/imaging/color/ColorCmyk.java | 3 +--
.../org/apache/commons/imaging/color/ColorDin99Lab.java | 3 +--
.../java/org/apache/commons/imaging/color/ColorHsl.java | 3 +--
.../java/org/apache/commons/imaging/color/ColorHsv.java | 3 +--
.../org/apache/commons/imaging/color/ColorHunterLab.java | 3 +--
.../java/org/apache/commons/imaging/color/ColorXyz.java | 3 +--
.../commons/imaging/formats/jpeg/iptc/IptcParser.java | 6 ++----
12 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/ColorTools.java b/src/main/java/org/apache/commons/imaging/ColorTools.java
index 12dc7837..e7c6774e 100644
--- a/src/main/java/org/apache/commons/imaging/ColorTools.java
+++ b/src/main/java/org/apache/commons/imaging/ColorTools.java
@@ -51,11 +51,9 @@ public class ColorTools {
bi = relabelColorSpace(bi, from);
- BufferedImage result = op.filter(bi, null);
+ final BufferedImage result = op.filter(bi, null);
- result = relabelColorSpace(result, to);
-
- return result;
+ return relabelColorSpace(result, to);
}
public BufferedImage convertBetweenColorSpacesX2(BufferedImage bi, final ColorSpace from, final ColorSpace to) {
@@ -76,9 +74,7 @@ public class ColorTools {
bi = op.filter(bi, null);
- bi = relabelColorSpace(bi, to);
-
- return bi;
+ return relabelColorSpace(bi, to);
}
@@ -103,11 +99,9 @@ public class ColorTools {
final ColorConvertOp op = new ColorConvertOp(from, to, hints);
- BufferedImage result = op.filter(bi, null);
-
- result = relabelColorSpace(result, to);
+ final BufferedImage result = op.filter(bi, null);
- return result;
+ return relabelColorSpace(result, to);
}
public BufferedImage convertToIccProfile(final BufferedImage bi, final ICC_Profile to) {
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
index 7802c3db..9c8dca74 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java
@@ -125,8 +125,7 @@ public final class ColorCieLab {
temp = Double.doubleToLongBits(a);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(b);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
index 923cf7a7..974fdc3e 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java
@@ -126,8 +126,7 @@ public final class ColorCieLch {
temp = Double.doubleToLongBits(c);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(h);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
index 6c10a6a4..e19ba4d0 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java
@@ -125,8 +125,7 @@ public final class ColorCieLuv {
temp = Double.doubleToLongBits(u);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(v);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmy.java b/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
index 210cd0e0..f88ebfe7 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCmy.java
@@ -158,8 +158,7 @@ public final class ColorCmy {
temp = Double.doubleToLongBits(m);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(y);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
index f8bfd611..b904534d 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
@@ -173,8 +173,7 @@ public final class ColorCmyk {
temp = Double.doubleToLongBits(y);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(k);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorDin99Lab.java b/src/main/java/org/apache/commons/imaging/color/ColorDin99Lab.java
index 3a51d00f..55976263 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorDin99Lab.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorDin99Lab.java
@@ -70,8 +70,7 @@ public final class ColorDin99Lab {
temp = Double.doubleToLongBits(a99);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(b99);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
index 39e3c9d2..356a301e 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java
@@ -125,8 +125,7 @@ public final class ColorHsl {
temp = Double.doubleToLongBits(s);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(l);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
index 5db41cf1..1f5cf0ad 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java
@@ -125,8 +125,7 @@ public final class ColorHsv {
temp = Double.doubleToLongBits(s);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(v);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java b/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
index 946a8dcb..585edcf7 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java
@@ -125,8 +125,7 @@ public final class ColorHunterLab {
temp = Double.doubleToLongBits(a);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(b);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
index 0f220646..4cec9d45 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java
@@ -125,8 +125,7 @@ public final class ColorXyz {
temp = Double.doubleToLongBits(y);
result = 31 * result + (int) (temp ^ temp >>> 32);
temp = Double.doubleToLongBits(z);
- result = 31 * result + (int) (temp ^ temp >>> 32);
- return result;
+ return 31 * result + (int) (temp ^ temp >>> 32);
}
@Override
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index 57550006..b6860a72 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -386,7 +386,7 @@ public class IptcParser extends BinaryFileParser {
break;
}
}
- byte[] blockData;
+ final byte[] blockData;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (BinaryOutputStream bos = BinaryOutputStream.create(baos, getByteOrder())) {
if (!charset.equals(DEFAULT_CHARSET)) {
@@ -438,9 +438,7 @@ public class IptcParser extends BinaryFileParser {
}
}
- blockData = baos.toByteArray();
-
- return blockData;
+ return baos.toByteArray();
}
public byte[] writePhotoshopApp13Segment(final PhotoshopApp13Data data) throws IOException, ImagingException {