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

Fix an NPE that comes up in full testing from last commit

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2695 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen@gmail.com 2013-04-26 17:42:22 +00:00
parent e320bdadac
commit 99e41ef79d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java
View file

@ -187,10 +187,10 @@ public final class PDF417ScanningDecoder {
private static BarcodeMetadata getBarcodeMetadata(DetectionResultRowIndicatorColumn leftRowIndicatorColumn, private static BarcodeMetadata getBarcodeMetadata(DetectionResultRowIndicatorColumn leftRowIndicatorColumn,
DetectionResultRowIndicatorColumn rightRowIndicatorColumn) { DetectionResultRowIndicatorColumn rightRowIndicatorColumn) {
if (leftRowIndicatorColumn == null || leftRowIndicatorColumn.getBarcodeMetadata() == null) { if (leftRowIndicatorColumn == null || leftRowIndicatorColumn.getBarcodeMetadata() == null) {
return rightRowIndicatorColumn.getBarcodeMetadata(); return rightRowIndicatorColumn == null ? null : rightRowIndicatorColumn.getBarcodeMetadata();
} }
if (rightRowIndicatorColumn == null || rightRowIndicatorColumn.getBarcodeMetadata() == null) { if (rightRowIndicatorColumn == null || rightRowIndicatorColumn.getBarcodeMetadata() == null) {
return leftRowIndicatorColumn.getBarcodeMetadata(); return leftRowIndicatorColumn == null ? null : leftRowIndicatorColumn.getBarcodeMetadata();
} }
BarcodeMetadata leftBarcodeMetadata = leftRowIndicatorColumn.getBarcodeMetadata(); BarcodeMetadata leftBarcodeMetadata = leftRowIndicatorColumn.getBarcodeMetadata();
BarcodeMetadata rightBarcodeMetadata = rightRowIndicatorColumn.getBarcodeMetadata(); BarcodeMetadata rightBarcodeMetadata = rightRowIndicatorColumn.getBarcodeMetadata();