Author: sebb
Date: Tue Oct 22 22:07:34 2013
New Revision: 1534819
URL: http://svn.apache.org/r1534819
Log:
Don't reuse same name as a field
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutLongestAxisImplementation.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
Tue Oct 22 22:07:34 2013
@@ -138,20 +138,20 @@ class RgbeInfo extends BinaryFunctions {
public float[][] getPixelData() throws IOException, ImageReadException {
// Read into local variables to ensure that we have seeked into the
file
// far enough
- final int height = getHeight();
- final int width = getWidth();
+ final int ht = getHeight();
+ final int wd = getWidth();
- if (width >= 32768) {
+ if (wd >= 32768) {
throw new ImageReadException(
"Scan lines must be less than 32768 bytes long");
}
- final byte[] scanLineBytes = ByteConversions.toBytes((short)width,
+ final byte[] scanLineBytes = ByteConversions.toBytes((short)wd,
ByteOrder.BIG_ENDIAN);
- final byte[] rgbe = new byte[width * 4];
- final float[][] out = new float[3][width * height];
+ final byte[] rgbe = new byte[wd * 4];
+ final float[][] out = new float[3][wd * ht];
- for (int i = 0; i < height; i++) {
+ for (int i = 0; i < ht; i++) {
in.readAndVerifyBytes(TWO_TWO, "Scan line " + i
+ " expected to start with 0x2 0x2");
in.readAndVerifyBytes(scanLineBytes, "Scan line " + i
@@ -160,12 +160,12 @@ class RgbeInfo extends BinaryFunctions {
decompress(in, rgbe);
for (int channel = 0; channel < 3; channel++) {
- final int channelOffset = channel * width;
- final int eOffset = 3 * width;
+ final int channelOffset = channel * wd;
+ final int eOffset = 3 * wd;
- for (int p = 0; p < width; p++) {
+ for (int p = 0; p < wd; p++) {
final int mantissa = rgbe[p + eOffset] & 0xff;
- final int pos = p + i * width;
+ final int pos = p + i * wd;
if (0 == mantissa) {
out[channel][pos] = 0;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
Tue Oct 22 22:07:34 2013
@@ -691,10 +691,10 @@ public class TiffDirectory extends TiffE
if ((jpegInterchangeFormat != null)
&& (jpegInterchangeFormatLength != null)) {
- final int offset = jpegInterchangeFormat.getIntArrayValue()[0];
+ final int offSet = jpegInterchangeFormat.getIntArrayValue()[0];
final int byteCount =
jpegInterchangeFormatLength.getIntArrayValue()[0];
- return new ImageDataElement(offset, byteCount);
+ return new ImageDataElement(offSet, byteCount);
} else {
throw new ImageReadException("Couldn't find image data.");
}
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
Tue Oct 22 22:07:34 2013
@@ -317,12 +317,12 @@ public class TiffReader extends BinaryFi
}
public Collector(final Map<String,Object> params) {
- boolean readThumbnails = true;
+ boolean tmpReadThumbnails = true;
if (params != null &&
params.containsKey(PARAM_KEY_READ_THUMBNAILS)) {
- readThumbnails = Boolean.TRUE.equals(params
+ tmpReadThumbnails = Boolean.TRUE.equals(params
.get(PARAM_KEY_READ_THUMBNAILS));
}
- this.readThumbnails = readThumbnails;
+ this.readThumbnails = tmpReadThumbnails;
}
public boolean setTiffHeader(final TiffHeader tiffHeader) {
@@ -372,24 +372,25 @@ public class TiffReader extends BinaryFi
}
}
- private static class DirectoryCollector extends Collector {
- private final boolean readImageData;
-
- public DirectoryCollector(final boolean readImageData) {
- this.readImageData = readImageData;
- }
-
- @Override
- public boolean addDirectory(final TiffDirectory directory) {
- super.addDirectory(directory);
- return false;
- }
-
- @Override
- public boolean readImageData() {
- return readImageData;
- }
- }
+// NOT USED
+// private static class DirectoryCollector extends Collector {
+// private final boolean readImageData;
+//
+// public DirectoryCollector(final boolean readImageData) {
+// this.readImageData = readImageData;
+// }
+//
+// @Override
+// public boolean addDirectory(final TiffDirectory directory) {
+// super.addDirectory(directory);
+// return false;
+// }
+//
+// @Override
+// public boolean readImageData() {
+// return readImageData;
+// }
+// }
public TiffContents readFirstDirectory(final ByteSource byteSource, final
Map<String,Object> params,
final boolean readImageData, final FormatCompliance
formatCompliance)
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
Tue Oct 22 22:07:34 2013
@@ -56,10 +56,10 @@ class ColorGroup {
throw new ImageWriteException("empty color_group");
}
- int totalPoints = 0;
+ int total = 0;
for (int i = 0; i < color_counts.size(); i++) {
final ColorCount color = color_counts.get(i);
- totalPoints += color.count;
+ total += color.count;
min_alpha = Math.min(min_alpha, color.alpha);
max_alpha = Math.max(max_alpha, color.alpha);
@@ -70,7 +70,7 @@ class ColorGroup {
min_blue = Math.min(min_blue, color.blue);
max_blue = Math.max(max_blue, color.blue);
}
- this.totalPoints = totalPoints;
+ this.totalPoints = total;
alpha_diff = max_alpha - min_alpha;
red_diff = max_red - min_red;
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
Tue Oct 22 22:07:34 2013
@@ -135,10 +135,10 @@ class ColorSpaceSubset {
for (int green = mins[1]; green <= maxs[1]; green++) {
for (int blue = mins[2]; blue <= maxs[2]; blue++) {
// note: order reversed
- final int index = (blue << (2 * precision))
+ final int idx = (blue << (2 * precision))
| (green << (1 * precision))
| (red << (0 * precision));
- final int count = table[index];
+ final int count = table[idx];
redsum += count * (red << (8 - precision));
greensum += count * (green << (8 - precision));
bluesum += count * (blue << (8 - precision));
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutLongestAxisImplementation.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutLongestAxisImplementation.java?rev=1534819&r1=1534818&r2=1534819&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutLongestAxisImplementation.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutLongestAxisImplementation.java
Tue Oct 22 22:07:34 2013
@@ -61,7 +61,7 @@ public class MedianCutLongestAxisImpleme
private void doCut(final ColorGroup color_group, final ColorComponent mode,
final List<ColorGroup> color_groups, final boolean ignoreAlpha)
throws ImageWriteException {
- final Comparator<ColorCount> comparator = new Comparator<ColorCount>()
{
+ final Comparator<ColorCount> comp = new Comparator<ColorCount>() {
public int compare(final ColorCount c1, final ColorCount c2) {
switch (mode) {
case ALPHA:
@@ -78,7 +78,7 @@ public class MedianCutLongestAxisImpleme
}
};
- Collections.sort(color_group.color_counts, comparator);
+ Collections.sort(color_group.color_counts, comp);
final int count_half = (int) Math.round((double)
color_group.totalPoints / 2);
int old_count = 0, new_count = 0;
int median_index;
