commit e715fec42a2f8643c8f53c331f7218a1e62b0dc2
author Sean Owen <srowen@gmail.com> Thu Jul 24 12:05:50 2014 +0100
committer Sean Owen <srowen@gmail.com> Thu Jul 24 12:05:50 2014 +0100
tree 8c0282fd7dfc249820aca6e84ea7be0264ffe9a8
parent 81963c8725adb0c1270cca102b6ddb03dbfb4f82

Avoid NPE when underlying result point is null, for some reason

core/src/main/java/com/google/zxing/multi/GenericMultipleBarcodeReader.java

diff --git a/core/src/main/java/com/google/zxing/multi/GenericMultipleBarcodeReader.java b/core/src/main/java/com/google/zxing/multi/GenericMultipleBarcodeReader.java
index 276279b..cc8725d 100644
--- a/core/src/main/java/com/google/zxing/multi/GenericMultipleBarcodeReader.java
+++ b/core/src/main/java/com/google/zxing/multi/GenericMultipleBarcodeReader.java
@@ -160,7 +160,9 @@
     ResultPoint[] newResultPoints = new ResultPoint[oldResultPoints.length];
     for (int i = 0; i < oldResultPoints.length; i++) {
       ResultPoint oldPoint = oldResultPoints[i];
-      newResultPoints[i] = new ResultPoint(oldPoint.getX() + xOffset, oldPoint.getY() + yOffset);
+      if (oldPoint != null) {
+        newResultPoints[i] = new ResultPoint(oldPoint.getX() + xOffset, oldPoint.getY() + yOffset);
+      }
     }
     Result newResult = new Result(result.getText(), result.getRawBytes(), newResultPoints, result.getBarcodeFormat());
     newResult.putAllMetadata(result.getResultMetadata());