X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cpp%2Fcore%2Fsrc%2Fzxing%2Foned%2FUPCEReader.cpp;fp=cpp%2Fcore%2Fsrc%2Fzxing%2Foned%2FUPCEReader.cpp;h=520512ed6fc96f0bcba166c11b12fa5ea7ecfb50;hb=8f2a89aa54e084988c626aa2e5cf072ca6ed58e5;hp=cd36492790ab112edf2b4add2e604213f03e28f6;hpb=957965317bcf38a4649ff234893f06dbe12d4045;p=zxing.git

diff --git a/cpp/core/src/zxing/oned/UPCEReader.cpp b/cpp/core/src/zxing/oned/UPCEReader.cpp
index cd364927..520512ed 100644
--- a/cpp/core/src/zxing/oned/UPCEReader.cpp
+++ b/cpp/core/src/zxing/oned/UPCEReader.cpp
@@ -42,13 +42,13 @@ namespace zxing {
     UPCEReader::UPCEReader() {
     }
 
-    int UPCEReader::decodeMiddle(Ref<BitArray> row, int startRange[], int startRangeLen,
+    int UPCEReader::decodeMiddle(Ref<BitArray> row, int startGuardBegin, int startGuardEnd,
         std::string& resultString) {
       const int countersLen = 4;
       int counters[countersLen] = { 0, 0, 0, 0 };
 
       int end = row->getSize();
-      int rowOffset = startRange[1];
+      int rowOffset = startGuardEnd;
       int lgPatternFound = 0;
 
       for (int x = 0; x < 6 && rowOffset < end; x++) {
@@ -72,9 +72,10 @@ namespace zxing {
       return rowOffset;
     }
 
-    int* UPCEReader::decodeEnd(Ref<BitArray> row, int endStart) {
+    bool UPCEReader::decodeEnd(Ref<BitArray> row, int endStart, int* endGuardBegin,
+        int* endGuardEnd) {
       return findGuardPattern(row, endStart, true, MIDDLE_END_PATTERN,
-          sizeof(MIDDLE_END_PATTERN) / sizeof(int));
+          sizeof(MIDDLE_END_PATTERN) / sizeof(int), endGuardBegin, endGuardEnd);
     }
 
     bool UPCEReader::checkChecksum(std::string s){