From f307690f05bc8a520f649c9b5794d2ae23ab91a7 Mon Sep 17 00:00:00 2001 From: flyashi Date: Thu, 26 Aug 2010 14:46:31 +0000 Subject: [PATCH] C++: fix dormat BitArray quiet zone checking bug that was causing rampant false positives also make zxing test app decode call a little cleaner. git-svn-id: http://zxing.googlecode.com/svn/trunk@1566 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- cpp/core/src/zxing/common/BitArray.cpp | 4 ++-- cpp/magick/src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/core/src/zxing/common/BitArray.cpp b/cpp/core/src/zxing/common/BitArray.cpp index e5bfb5b3..02a2a19c 100644 --- a/cpp/core/src/zxing/common/BitArray.cpp +++ b/cpp/core/src/zxing/common/BitArray.cpp @@ -90,9 +90,9 @@ bool BitArray::isRange(size_t start, size_t end, bool value) { size_t lastWord = end >> logBits_; for (size_t i = firstWord; i <= lastWord; i++) { size_t firstBit = i > firstWord ? 0 : start & bitsMask_; - size_t lastBit = i < lastWord ? logBits_ : end & bitsMask_; + size_t lastBit = i < lastWord ? bitsPerWord_ - 1: end & bitsMask_; unsigned int mask; - if (firstBit == 0 && lastBit == logBits_) { + if (firstBit == 0 && lastBit == bitsPerWord_ - 1) { mask = numeric_limits::max(); } else { mask = 0; diff --git a/cpp/magick/src/main.cpp b/cpp/magick/src/main.cpp index 1aba19fe..7dfbb6df 100644 --- a/cpp/magick/src/main.cpp +++ b/cpp/magick/src/main.cpp @@ -54,7 +54,7 @@ static const int MAX_EXPECTED = 1024; Ref decode(Ref image, DecodeHints hints) { Ref reader(new MultiFormatReader); - return Ref (new Result(*reader->decode(image, hints))); + return reader->decode(image, hints); } -- 2.20.1