Renamed a local variable.

pull/134/head
Project Nayuki 5 years ago
parent 4671dca0ad
commit 42c357ae1c

@ -482,13 +482,13 @@ public final class QrCode {
// Iterate over adjacent pairs of rows // Iterate over adjacent pairs of rows
for (int index = 0, downIndex = size, end = size * size; index < end; ) { for (int index = 0, downIndex = size, end = size * size; index < end; ) {
Arrays.fill(runHistory, 0); Arrays.fill(runHistory, 0);
int color = 0; int runColor = 0;
int runX = 0; int runX = 0;
int curRow = 0; int curRow = 0;
int nextRow = 0; int nextRow = 0;
for (int x = 0; x < size; x++, index++, downIndex++) { for (int x = 0; x < size; x++, index++, downIndex++) {
int c = getBit(modules[index >>> 5], index); int c = getBit(modules[index >>> 5], index);
if (c == color) { if (c == runColor) {
runX++; runX++;
if (runX == 5) if (runX == 5)
result += PENALTY_N1; result += PENALTY_N1;
@ -496,9 +496,9 @@ public final class QrCode {
result++; result++;
} else { } else {
addRunToHistory(runX, runHistory); addRunToHistory(runX, runHistory);
if (color == 0 && hasFinderLikePattern(runHistory)) if (runColor == 0 && hasFinderLikePattern(runHistory))
result += PENALTY_N3; result += PENALTY_N3;
color = c; runColor = c;
runX = 1; runX = 1;
} }
black += c; black += c;
@ -511,7 +511,7 @@ public final class QrCode {
} }
} }
addRunToHistory(runX, runHistory); addRunToHistory(runX, runHistory);
if (color == 1) if (runColor == 1)
addRunToHistory(0, runHistory); // Dummy run of white addRunToHistory(0, runHistory); // Dummy run of white
if (hasFinderLikePattern(runHistory)) if (hasFinderLikePattern(runHistory))
result += PENALTY_N3; result += PENALTY_N3;
@ -520,11 +520,11 @@ public final class QrCode {
// Iterate over single columns // Iterate over single columns
for (int x = 0; x < size; x++) { for (int x = 0; x < size; x++) {
Arrays.fill(runHistory, 0); Arrays.fill(runHistory, 0);
int color = 0; int runColor = 0;
int runY = 0; int runY = 0;
for (int y = 0, index = x; y < size; y++, index += size) { for (int y = 0, index = x; y < size; y++, index += size) {
int c = getBit(modules[index >>> 5], index); int c = getBit(modules[index >>> 5], index);
if (c == color) { if (c == runColor) {
runY++; runY++;
if (runY == 5) if (runY == 5)
result += PENALTY_N1; result += PENALTY_N1;
@ -532,14 +532,14 @@ public final class QrCode {
result++; result++;
} else { } else {
addRunToHistory(runY, runHistory); addRunToHistory(runY, runHistory);
if (color == 0 && hasFinderLikePattern(runHistory)) if (runColor == 0 && hasFinderLikePattern(runHistory))
result += PENALTY_N3; result += PENALTY_N3;
color = c; runColor = c;
runY = 1; runY = 1;
} }
} }
addRunToHistory(runY, runHistory); addRunToHistory(runY, runHistory);
if (color == 1) if (runColor == 1)
addRunToHistory(0, runHistory); // Dummy run of white addRunToHistory(0, runHistory); // Dummy run of white
if (hasFinderLikePattern(runHistory)) if (hasFinderLikePattern(runHistory))
result += PENALTY_N3; result += PENALTY_N3;

Loading…
Cancel
Save