Skip to content

Commit 106bf73

Browse files
garydgregorygarydgregory
committed
Inline single use local variable
1 parent fe425c4 commit 106bf73

File tree

2 files changed

+16
-36
lines changed

2 files changed

+16
-36
lines changed

‎src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataFloat.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public TiffRasterDataFloat(final int width, final int height) {
6060
*/
6161
public TiffRasterDataFloat(final int width, final int height, final float[] data) {
6262
super(width, height, 1);
63-
6463
if (data == null || data.length < nCells) {
6564
throw new IllegalArgumentException("Specified data does not contain sufficient elements");
6665
}
@@ -89,7 +88,6 @@ public TiffRasterDataFloat(final int width, final int height, final int samplesP
8988
*/
9089
public TiffRasterDataFloat(final int width, final int height, final int samplesPerCell, final float[] data) {
9190
super(width, height, samplesPerCell);
92-
9391
if (data == null || data.length < nCells) {
9492
throw new IllegalArgumentException("Specified data does not contain sufficient elements");
9593
}
@@ -142,8 +140,7 @@ public int[] getIntData() {
142140
*/
143141
@Override
144142
public int getIntValue(final int x, final int y) {
145-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
146-
return (int) data[index];
143+
return (int) data[checkCoordinatesAndComputeIndex(x, y, 0)];
147144
}
148145

149146
/**
@@ -156,8 +153,7 @@ public int getIntValue(final int x, final int y) {
156153
*/
157154
@Override
158155
public int getIntValue(final int x, final int y, final int i) {
159-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
160-
return (int) data[index];
156+
return (int) data[checkCoordinatesAndComputeIndex(x, y, 0)];
161157
}
162158

163159
/**
@@ -190,8 +186,7 @@ public TiffRasterStatistics getSimpleStatistics(final float valueToExclude) {
190186
*/
191187
@Override
192188
public float getValue(final int x, final int y) {
193-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
194-
return data[index];
189+
return data[checkCoordinatesAndComputeIndex(x, y, 0)];
195190
}
196191

197192
/**
@@ -204,8 +199,7 @@ public float getValue(final int x, final int y) {
204199
*/
205200
@Override
206201
public float getValue(final int x, final int y, final int i) {
207-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
208-
return data[index];
202+
return data[checkCoordinatesAndComputeIndex(x, y, i)];
209203
}
210204

211205
/**
@@ -217,8 +211,7 @@ public float getValue(final int x, final int y, final int i) {
217211
*/
218212
@Override
219213
public void setIntValue(final int x, final int y, final int value) {
220-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
221-
data[index] = value;
214+
data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
222215
}
223216

224217
/**
@@ -231,8 +224,7 @@ public void setIntValue(final int x, final int y, final int value) {
231224
*/
232225
@Override
233226
public void setIntValue(final int x, final int y, final int i, final int value) {
234-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
235-
data[index] = value;
227+
data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
236228
}
237229

238230
/**
@@ -244,8 +236,7 @@ public void setIntValue(final int x, final int y, final int i, final int value)
244236
*/
245237
@Override
246238
public void setValue(final int x, final int y, final float value) {
247-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
248-
data[index] = value;
239+
data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
249240
}
250241

251242
/**
@@ -258,8 +249,7 @@ public void setValue(final int x, final int y, final float value) {
258249
*/
259250
@Override
260251
public void setValue(final int x, final int y, final int i, final float value) {
261-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
262-
data[index] = value;
252+
data[checkCoordinatesAndComputeIndex(x, y, i)] = value;
263253
}
264254

265255
}

‎src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataInt.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ public TiffRasterDataInt(final int width, final int height, final int samplesPer
7171
*/
7272
public TiffRasterDataInt(final int width, final int height, final int samplesPerPixel, final int[] data) {
7373
super(width, height, samplesPerPixel);
74-
7574
if (data == null || data.length < nCells) {
7675
throw new IllegalArgumentException("Specified data does not contain sufficient elements");
7776
}
@@ -87,7 +86,6 @@ public TiffRasterDataInt(final int width, final int height, final int samplesPer
8786
*/
8887
public TiffRasterDataInt(final int width, final int height, final int[] data) {
8988
super(width, height, 1);
90-
9189
if (data == null || data.length < nCells) {
9290
throw new IllegalArgumentException("Specified data does not contain sufficient elements");
9391
}
@@ -141,8 +139,7 @@ public int[] getIntData() {
141139
*/
142140
@Override
143141
public int getIntValue(final int x, final int y) {
144-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
145-
return data[index];
142+
return data[checkCoordinatesAndComputeIndex(x, y, 0)];
146143
}
147144

148145
/**
@@ -155,8 +152,7 @@ public int getIntValue(final int x, final int y) {
155152
*/
156153
@Override
157154
public int getIntValue(final int x, final int y, final int i) {
158-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
159-
return data[index];
155+
return data[checkCoordinatesAndComputeIndex(x, y, i)];
160156
}
161157

162158
/**
@@ -189,8 +185,7 @@ public TiffRasterStatistics getSimpleStatistics(final float valueToExclude) {
189185
*/
190186
@Override
191187
public float getValue(final int x, final int y) {
192-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
193-
return data[index];
188+
return data[checkCoordinatesAndComputeIndex(x, y, 0)];
194189
}
195190

196191
/**
@@ -203,8 +198,7 @@ public float getValue(final int x, final int y) {
203198
*/
204199
@Override
205200
public float getValue(final int x, final int y, final int i) {
206-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
207-
return data[index];
201+
return data[checkCoordinatesAndComputeIndex(x, y, i)];
208202
}
209203

210204
/**
@@ -216,8 +210,7 @@ public float getValue(final int x, final int y, final int i) {
216210
*/
217211
@Override
218212
public void setIntValue(final int x, final int y, final int value) {
219-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
220-
data[index] = value;
213+
data[checkCoordinatesAndComputeIndex(x, y, 0)] = value;
221214
}
222215

223216
/**
@@ -230,8 +223,7 @@ public void setIntValue(final int x, final int y, final int value) {
230223
*/
231224
@Override
232225
public void setIntValue(final int x, final int y, final int i, final int value) {
233-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
234-
data[index] = value;
226+
data[checkCoordinatesAndComputeIndex(x, y, i)] = value;
235227
}
236228

237229
/**
@@ -243,8 +235,7 @@ public void setIntValue(final int x, final int y, final int i, final int value)
243235
*/
244236
@Override
245237
public void setValue(final int x, final int y, final float value) {
246-
final int index = checkCoordinatesAndComputeIndex(x, y, 0);
247-
data[index] = (int) value;
238+
data[checkCoordinatesAndComputeIndex(x, y, 0)] = (int) value;
248239
}
249240

250241
/**
@@ -257,7 +248,6 @@ public void setValue(final int x, final int y, final float value) {
257248
*/
258249
@Override
259250
public void setValue(final int x, final int y, final int i, final float value) {
260-
final int index = checkCoordinatesAndComputeIndex(x, y, i);
261-
data[index] = (int) value;
251+
data[checkCoordinatesAndComputeIndex(x, y, i)] = (int) value;
262252
}
263253
}

0 commit comments

Comments
 (0)