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 106bf7345ad45b86c44e6bf3f19bd6051191436e
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Apr 27 11:11:03 2025 -0400
Inline single use local variable
---
.../imaging/formats/tiff/TiffRasterDataFloat.java | 26 +++++++---------------
.../imaging/formats/tiff/TiffRasterDataInt.java | 26 +++++++---------------
2 files changed, 16 insertions(+), 36 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataFloat.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataFloat.java
index 57e9d0cc..87a26fad 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataFloat.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataFloat.java
@@ -60,7 +60,6 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
public TiffRasterDataFloat(final int width, final int height, final
float[] data) {
super(width, height, 1);
-
if (data == null || data.length < nCells) {
throw new IllegalArgumentException("Specified data does not
contain sufficient elements");
}
@@ -89,7 +88,6 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
public TiffRasterDataFloat(final int width, final int height, final int
samplesPerCell, final float[] data) {
super(width, height, samplesPerCell);
-
if (data == null || data.length < nCells) {
throw new IllegalArgumentException("Specified data does not
contain sufficient elements");
}
@@ -142,8 +140,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public int getIntValue(final int x, final int y) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- return (int) data[index];
+ return (int) data[checkCoordinatesAndComputeIndex(x, y, 0)];
}
/**
@@ -156,8 +153,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public int getIntValue(final int x, final int y, final int i) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- return (int) data[index];
+ return (int) data[checkCoordinatesAndComputeIndex(x, y, 0)];
}
/**
@@ -190,8 +186,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public float getValue(final int x, final int y) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, 0)];
}
/**
@@ -204,8 +199,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public float getValue(final int x, final int y, final int i) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, i)];
}
/**
@@ -217,8 +211,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public void setIntValue(final int x, final int y, final int value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
}
/**
@@ -231,8 +224,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public void setIntValue(final int x, final int y, final int i, final int
value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
}
/**
@@ -244,8 +236,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public void setValue(final int x, final int y, final float value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
}
/**
@@ -258,8 +249,7 @@ public final class TiffRasterDataFloat extends
AbstractTiffRasterData {
*/
@Override
public void setValue(final int x, final int y, final int i, final float
value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, i)] = value;
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataInt.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataInt.java
index 78e97232..60c52315 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataInt.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataInt.java
@@ -71,7 +71,6 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
public TiffRasterDataInt(final int width, final int height, final int
samplesPerPixel, final int[] data) {
super(width, height, samplesPerPixel);
-
if (data == null || data.length < nCells) {
throw new IllegalArgumentException("Specified data does not
contain sufficient elements");
}
@@ -87,7 +86,6 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
public TiffRasterDataInt(final int width, final int height, final int[]
data) {
super(width, height, 1);
-
if (data == null || data.length < nCells) {
throw new IllegalArgumentException("Specified data does not
contain sufficient elements");
}
@@ -141,8 +139,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public int getIntValue(final int x, final int y) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, 0)];
}
/**
@@ -155,8 +152,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public int getIntValue(final int x, final int y, final int i) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, i)];
}
/**
@@ -189,8 +185,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public float getValue(final int x, final int y) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, 0)];
}
/**
@@ -203,8 +198,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public float getValue(final int x, final int y, final int i) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- return data[index];
+ return data[checkCoordinatesAndComputeIndex(x, y, i)];
}
/**
@@ -216,8 +210,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public void setIntValue(final int x, final int y, final int value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
}
/**
@@ -230,8 +223,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public void setIntValue(final int x, final int y, final int i, final int
value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- data[index] = value;
+ data[checkCoordinatesAndComputeIndex(x, y, i)] = value;
}
/**
@@ -243,8 +235,7 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public void setValue(final int x, final int y, final float value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, 0);
- data[index] = (int) value;
+ data[checkCoordinatesAndComputeIndex(x, y, 0)] = (int) value;
}
/**
@@ -257,7 +248,6 @@ public final class TiffRasterDataInt extends
AbstractTiffRasterData {
*/
@Override
public void setValue(final int x, final int y, final int i, final float
value) {
- final int index = checkCoordinatesAndComputeIndex(x, y, i);
- data[index] = (int) value;
+ data[checkCoordinatesAndComputeIndex(x, y, i)] = (int) value;
}
}
