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 a9375088bb4269d91045fad3d605083930fe8e5f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jan 21 11:41:22 2025 -0500
Use MultipleVariableDeclarations
---
.../commons/imaging/color/ColorConversions.java | 22 ++++++---
.../commons/imaging/formats/jpeg/decoder/Dct.java | 55 ++++++++++++++++++----
2 files changed, 62 insertions(+), 15 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 27ed5a23..233c4bb5 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
@@ -35,7 +35,9 @@ public final class ColorConversions {
private static final double XYZ_t0 = 0.008856;
public static int convertCieLabToArgbTest(final int cieL, final int cieA,
final int cieB) {
- final double x, y, z;
+ final double x;
+ final double y;
+ final double z;
{
double varY = (cieL * 100.0 / 255.0 + 16.0) / 116.0;
@@ -52,7 +54,9 @@ public final class ColorConversions {
}
- final double r, g, b;
+ final double r;
+ final double g;
+ final double b;
{
final double varX = x / 100; // X = From 0 to REF_X
final double varY = y / 100; // Y = From 0 to REF_Y
@@ -368,8 +372,9 @@ public final class ColorConversions {
}
public static int convertHslToRgb(final double h, final double s, final
double l) {
- final double r, g, b;
-
+ final double r;
+ final double g;
+ final double b;
if (s == 0) {
// HSL values = 0 ÷ 1
r = l * 255; // RGB results = 0 ÷ 255
@@ -399,8 +404,9 @@ public final class ColorConversions {
}
public static int convertHsvToRgb(final double h, final double s, final
double v) {
- final double r, g, b;
-
+ final double r;
+ final double g;
+ final double b;
if (s == 0) {
// HSV values = 0 ÷ 1
r = v * 255;
@@ -416,7 +422,9 @@ public final class ColorConversions {
final double var2 = v * (1 - s * (varH - varI));
final double var3 = v * (1 - s * (1 - (varH - varI)));
- final double varR, varG, varB;
+ final double varR;
+ final double varG;
+ final double varB;
if (varI == 0) {
varR = v;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
index 56931249..c6bc8414 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
@@ -112,10 +112,29 @@ final class Dct {
}
public static void forwardDct8x8(final float[] matrix) {
- float a00, a10, a20, a30, a40, a50, a60, a70;
- float a01, a11, a21, a31, neg_a41, a51, a61;
- float a22, a23, mul5, a43, a53, a63;
- float a54, a74;
+ float a00;
+ float a10;
+ float a20;
+ float a30;
+ float a40;
+ float a50;
+ float a60;
+ float a70;
+ float a01;
+ float a11;
+ float a21;
+ float a31;
+ float neg_a41;
+ float a51;
+ float a61;
+ float a22;
+ float a23;
+ float mul5;
+ float a43;
+ float a53;
+ float a63;
+ float a54;
+ float a74;
for (int i = 0; i < 8; i++) {
a00 = matrix[8 * i] + matrix[8 * i + 7];
@@ -240,10 +259,30 @@ final class Dct {
}
public static void inverseDct8x8(final float[] matrix) {
- float a2, a3, a4, tmp1, tmp2, a5, a6, a7;
- float tmp4, neg_b4, b6, b2, b5;
- float tmp3, n0, n1, n2, n3, neg_n5;
- float m3, m4, m5, m6, neg_m7;
+ float a2;
+ float a3;
+ float a4;
+ float tmp1;
+ float tmp2;
+ float a5;
+ float a6;
+ float a7;
+ float tmp4;
+ float neg_b4;
+ float b6;
+ float b2;
+ float b5;
+ float tmp3;
+ float n0;
+ float n1;
+ float n2;
+ float n3;
+ float neg_n5;
+ float m3;
+ float m4;
+ float m5;
+ float m6;
+ float neg_m7;
for (int i = 0; i < 8; i++) {
a2 = matrix[8 * i + 2] - matrix[8 * i + 6];
