[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

flyashi flyashi at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Aug 4 01:32:37 UTC 2010


The following commit has been merged in the upstream branch:
commit 9b616f11d6847e2f9b13b28b3b8f57c5331ef957
Author: flyashi <flyashi at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue Jul 27 23:02:28 2010 +0000

    C++: ITFReader.cpp was throwing wrong exception
    
    ITFReader.cpp:75 was catching and re-throwing Exception instead of ReaderException, causing scanning to terminate prematurely in some cases (i.e. core/test/data/blackbox/ean13-1/23.JPG). The calling function, MultiFormatOneDReader::doDecode, is only catching ReaderException's. An Exception would be passed all the way up to the caller, even if scanning hasn't finished yet for other decoders for other rows.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1493 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/cpp/core/src/zxing/oned/ITFReader.cpp b/cpp/core/src/zxing/oned/ITFReader.cpp
index 4464326..95e7a1c 100644
--- a/cpp/core/src/zxing/oned/ITFReader.cpp
+++ b/cpp/core/src/zxing/oned/ITFReader.cpp
@@ -72,7 +72,7 @@ namespace zxing {
 			int* endRange;
 			try {
 				endRange = decodeEnd(row);
-			} catch (Exception e) {
+			} catch (ReaderException e) {
 				delete [] startRange;
 				throw e;
 			}

-- 
Multi-format 1D/2D barcode image processing library



More information about the Pkg-google-commits mailing list