DetectionResult.java (zxing-zxing-3.4.1) | : | DetectionResult.java (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
skipping to change at line 133 | skipping to change at line 133 | |||
return 0; | return 0; | |||
} | } | |||
int unadjustedCount = 0; | int unadjustedCount = 0; | |||
Codeword[] codewords = detectionResultColumns[barcodeColumnCount + 1].getCod ewords(); | Codeword[] codewords = detectionResultColumns[barcodeColumnCount + 1].getCod ewords(); | |||
for (int codewordsRow = 0; codewordsRow < codewords.length; codewordsRow++) { | for (int codewordsRow = 0; codewordsRow < codewords.length; codewordsRow++) { | |||
if (codewords[codewordsRow] == null) { | if (codewords[codewordsRow] == null) { | |||
continue; | continue; | |||
} | } | |||
int rowIndicatorRowNumber = codewords[codewordsRow].getRowNumber(); | int rowIndicatorRowNumber = codewords[codewordsRow].getRowNumber(); | |||
int invalidRowCounts = 0; | int invalidRowCounts = 0; | |||
for (int barcodeColumn = barcodeColumnCount + 1; barcodeColumn > 0 && inva | for (int barcodeColumn = barcodeColumnCount + 1; | |||
lidRowCounts < ADJUST_ROW_NUMBER_SKIP; barcodeColumn--) { | barcodeColumn > 0 && invalidRowCounts < ADJUST_ROW_NUMBER_SKIP; | |||
barcodeColumn--) { | ||||
Codeword codeword = detectionResultColumns[barcodeColumn].getCodewords() [codewordsRow]; | Codeword codeword = detectionResultColumns[barcodeColumn].getCodewords() [codewordsRow]; | |||
if (codeword != null) { | if (codeword != null) { | |||
invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, inval idRowCounts, codeword); | invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, inval idRowCounts, codeword); | |||
if (!codeword.hasValidRowNumber()) { | if (!codeword.hasValidRowNumber()) { | |||
unadjustedCount++; | unadjustedCount++; | |||
} | } | |||
} | } | |||
} | } | |||
} | } | |||
return unadjustedCount; | return unadjustedCount; | |||
skipping to change at line 158 | skipping to change at line 160 | |||
return 0; | return 0; | |||
} | } | |||
int unadjustedCount = 0; | int unadjustedCount = 0; | |||
Codeword[] codewords = detectionResultColumns[0].getCodewords(); | Codeword[] codewords = detectionResultColumns[0].getCodewords(); | |||
for (int codewordsRow = 0; codewordsRow < codewords.length; codewordsRow++) { | for (int codewordsRow = 0; codewordsRow < codewords.length; codewordsRow++) { | |||
if (codewords[codewordsRow] == null) { | if (codewords[codewordsRow] == null) { | |||
continue; | continue; | |||
} | } | |||
int rowIndicatorRowNumber = codewords[codewordsRow].getRowNumber(); | int rowIndicatorRowNumber = codewords[codewordsRow].getRowNumber(); | |||
int invalidRowCounts = 0; | int invalidRowCounts = 0; | |||
for (int barcodeColumn = 1; barcodeColumn < barcodeColumnCount + 1 && inva | for (int barcodeColumn = 1; | |||
lidRowCounts < ADJUST_ROW_NUMBER_SKIP; barcodeColumn++) { | barcodeColumn < barcodeColumnCount + 1 && invalidRowCounts < ADJUST_R | |||
OW_NUMBER_SKIP; | ||||
barcodeColumn++) { | ||||
Codeword codeword = detectionResultColumns[barcodeColumn].getCodewords() [codewordsRow]; | Codeword codeword = detectionResultColumns[barcodeColumn].getCodewords() [codewordsRow]; | |||
if (codeword != null) { | if (codeword != null) { | |||
invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, inval idRowCounts, codeword); | invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, inval idRowCounts, codeword); | |||
if (!codeword.hasValidRowNumber()) { | if (!codeword.hasValidRowNumber()) { | |||
unadjustedCount++; | unadjustedCount++; | |||
} | } | |||
} | } | |||
} | } | |||
} | } | |||
return unadjustedCount; | return unadjustedCount; | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 7 lines changed or added |