mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Micro optimization to maybe help https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=47419

Browse source
This commit is contained in:
Sean Owen 2022-05-16 09:28:14 -05:00
parent 78faea8058
commit 75dbbb00dd
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/src/main/java/com/google/zxing/datamatrix/encoder/HighLevelEncoder.java
View file

@ -253,29 +253,32 @@ public final class HighLevelEncoder {
} }
int charsProcessed = 0; int charsProcessed = 0;
byte[] mins = new byte[6];
int[] intCharCounts = new int[6];
while (true) { while (true) {
//step K //step K
if ((startpos + charsProcessed) == msg.length()) { if ((startpos + charsProcessed) == msg.length()) {
int min = Integer.MAX_VALUE; Arrays.fill(mins, (byte) 0);
byte[] mins = new byte[6]; Arrays.fill(intCharCounts, 0);
int[] intCharCounts = new int[6]; int min = findMinimums(charCounts, intCharCounts, Integer.MAX_VALUE, mins);
min = findMinimums(charCounts, intCharCounts, min, mins);
int minCount = getMinimumCount(mins); int minCount = getMinimumCount(mins);
if (intCharCounts[ASCII_ENCODATION] == min) { if (intCharCounts[ASCII_ENCODATION] == min) {
return ASCII_ENCODATION; return ASCII_ENCODATION;
} }
if (minCount == 1 && mins[BASE256_ENCODATION] > 0) { if (minCount == 1) {
return BASE256_ENCODATION; if (mins[BASE256_ENCODATION] > 0) {
} return BASE256_ENCODATION;
if (minCount == 1 && mins[EDIFACT_ENCODATION] > 0) { }
return EDIFACT_ENCODATION; if (mins[EDIFACT_ENCODATION] > 0) {
} return EDIFACT_ENCODATION;
if (minCount == 1 && mins[TEXT_ENCODATION] > 0) { }
return TEXT_ENCODATION; if (mins[TEXT_ENCODATION] > 0) {
} return TEXT_ENCODATION;
if (minCount == 1 && mins[X12_ENCODATION] > 0) { }
return X12_ENCODATION; if (mins[X12_ENCODATION] > 0) {
return X12_ENCODATION;
}
} }
return C40_ENCODATION; return C40_ENCODATION;
} }
@ -339,8 +342,8 @@ public final class HighLevelEncoder {
//step R //step R
if (charsProcessed >= 4) { if (charsProcessed >= 4) {
int[] intCharCounts = new int[6]; Arrays.fill(mins, (byte) 0);
byte[] mins = new byte[6]; Arrays.fill(intCharCounts, 0);
findMinimums(charCounts, intCharCounts, Integer.MAX_VALUE, mins); findMinimums(charCounts, intCharCounts, Integer.MAX_VALUE, mins);
if (intCharCounts[ASCII_ENCODATION] < min(intCharCounts[BASE256_ENCODATION], if (intCharCounts[ASCII_ENCODATION] < min(intCharCounts[BASE256_ENCODATION],
@ -401,17 +404,14 @@ public final class HighLevelEncoder {
} }
private static int findMinimums(float[] charCounts, int[] intCharCounts, int min, byte[] mins) { private static int findMinimums(float[] charCounts, int[] intCharCounts, int min, byte[] mins) {
Arrays.fill(mins, (byte) 0);
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
intCharCounts[i] = (int) Math.ceil(charCounts[i]); int current = (intCharCounts[i] = (int) Math.ceil(charCounts[i]));
int current = intCharCounts[i];
if (min > current) { if (min > current) {
min = current; min = current;
Arrays.fill(mins, (byte) 0); Arrays.fill(mins, (byte) 0);
} }
if (min == current) { if (min == current) {
mins[i]++; mins[i]++;
} }
} }
return min; return min;