X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=cpp%2Fcore%2Fsrc%2Fzxing%2Foned%2FEAN8Reader.cpp;h=fb94f150054ac5a6a9dab32a5b9db1f0cea92188;hp=e3c0e2a7e5b6b76aa29d4e7d5adc303d19f0b3fd;hb=45e643cea495289f6e95112482a3fd3086ef4431;hpb=d7cf61c05100985f6dd9dddc1f4631cb690c28fa

diff --git a/cpp/core/src/zxing/oned/EAN8Reader.cpp b/cpp/core/src/zxing/oned/EAN8Reader.cpp
index e3c0e2a7..fb94f150 100644
--- a/cpp/core/src/zxing/oned/EAN8Reader.cpp
+++ b/cpp/core/src/zxing/oned/EAN8Reader.cpp
@@ -2,7 +2,6 @@
  *  EAN8Reader.cpp
  *  ZXing
  *
- *  Created by Lukasz Warchol on 10-01-25.
  *  Copyright 2010 ZXing authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,41 +21,55 @@
 #include <zxing/ReaderException.h>
 
 namespace zxing {
-	namespace oned {
-		
-		EAN8Reader::EAN8Reader(){ }
-		
-		int EAN8Reader::decodeMiddle(Ref<BitArray> row, int startRange[], int startRangeLen, std::string& resultString){
-			const int countersLen = 4;
-			int counters[countersLen] = { 0, 0, 0, 0 };
-			
-			int end = row->getSize();
-			int rowOffset = startRange[1];
-			
-			for (int x = 0; x < 4 && rowOffset < end; x++) {
-				int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, UPC_EAN_PATTERNS_L_PATTERNS);
-				resultString.append(1, (char) ('0' + bestMatch));
-				for (int i = 0; i < countersLen; i++) {
-					rowOffset += counters[i];
-				}
-			}
-			
-			int* middleRange = findGuardPattern(row, rowOffset, true, (int*)getMIDDLE_PATTERN(), getMIDDLE_PATTERN_LEN());
-			rowOffset = middleRange[1];
-			
-			for (int x = 0; x < 4 && rowOffset < end; x++) {
-				int bestMatch = decodeDigit(row, counters, countersLen, rowOffset, UPC_EAN_PATTERNS_L_PATTERNS);
-				resultString.append(1, (char) ('0' + bestMatch));
-				for (int i = 0; i < countersLen; i++) {
-					rowOffset += counters[i];
-				}
-			}
-			
-			return rowOffset;
-		}
-		
-		BarcodeFormat EAN8Reader::getBarcodeFormat(){
-			return BarcodeFormat_EAN_8;
-		}
-	}
+  namespace oned {
+
+    EAN8Reader::EAN8Reader(){ }
+
+    int EAN8Reader::decodeMiddle(Ref<BitArray> row, int startRange[], int startRangeLen,
+        std::string& resultString){
+      const int countersLen = 4;
+      int counters[countersLen] = { 0, 0, 0, 0 };
+
+      int end = row->getSize();
+      int rowOffset = startRange[1];
+
+      for (int x = 0; x < 4 && rowOffset < end; x++) {
+        int bestMatch = decodeDigit(row, counters, countersLen, rowOffset,
+            UPC_EAN_PATTERNS_L_PATTERNS);
+        if (bestMatch < 0) {
+          return -1;
+        }
+        resultString.append(1, (char) ('0' + bestMatch));
+        for (int i = 0; i < countersLen; i++) {
+          rowOffset += counters[i];
+        }
+      }
+
+      int* middleRange = findGuardPattern(row, rowOffset, true, (int*)getMIDDLE_PATTERN(),
+            getMIDDLE_PATTERN_LEN());
+      if (middleRange != NULL) {
+        rowOffset = middleRange[1];
+        for (int x = 0; x < 4 && rowOffset < end; x++) {
+          int bestMatch = decodeDigit(row, counters, countersLen, rowOffset,
+              UPC_EAN_PATTERNS_L_PATTERNS);
+          if (bestMatch < 0) {
+            delete [] middleRange;
+            return -1;
+          }
+          resultString.append(1, (char) ('0' + bestMatch));
+          for (int i = 0; i < countersLen; i++) {
+            rowOffset += counters[i];
+          }
+        }
+
+        delete [] middleRange;
+        return rowOffset;
+      }
+      return -1;
+    }
+
+    BarcodeFormat EAN8Reader::getBarcodeFormat(){
+      return BarcodeFormat_EAN_8;
+    }
+  }
 }