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

[flyashi]

The following commit has been merged in the upstream branch:
commit 5014108e26cacf182cab708d80130abbf190d00a
Author: flyashi <flyashi at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Thu Jul 29 18:50:33 2010 +0000

    C++ port: minor code and comment cleanups all over the place
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1494 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h b/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h
index bff8498..e38a703 100644
--- a/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h
+++ b/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h
@@ -2,9 +2,7 @@
  *  GlobalHistogramBinarizer.h
  *  zxing
  *
- *  Created by Ralf Kistner on 16/10/2009.
- *  Copyright 2008 ZXing authors All rights reserved.
- *  Modified by Lukasz Warchol on 02/02/2010.
+ *  Copyright 2010 ZXing authors All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +29,7 @@ namespace zxing {
 	
 	class GlobalHistogramBinarizer : public Binarizer {
 	 private:
-      Ref<BitMatrix> cached_matrix_;
+    Ref<BitMatrix> cached_matrix_;
 	  Ref<BitArray> cached_row_;
 	  int cached_row_num_;
 
diff --git a/cpp/core/src/zxing/oned/ITFReader.cpp b/cpp/core/src/zxing/oned/ITFReader.cpp
index 95e7a1c..7db44f9 100644
--- a/cpp/core/src/zxing/oned/ITFReader.cpp
+++ b/cpp/core/src/zxing/oned/ITFReader.cpp
@@ -72,9 +72,9 @@ namespace zxing {
 			int* endRange;
 			try {
 				endRange = decodeEnd(row);
-			} catch (ReaderException e) {
+			} catch (ReaderException re) {
 				delete [] startRange;
-				throw e;
+				throw re;
 			}
 			
 			std::string tmpResult;
@@ -215,9 +215,9 @@ namespace zxing {
 				endPattern[1] = row->getSize() - temp;
 				
 				return endPattern;
-			}catch (Exception e) {
+			} catch (ReaderException re) {
 				row->reverse();
-				throw e;
+				throw re;
 			} 
 		}
 		

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