From 5014108e26cacf182cab708d80130abbf190d00a Mon Sep 17 00:00:00 2001 From: flyashi Date: Thu, 29 Jul 2010 18:50:33 +0000 Subject: [PATCH] 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 --- cpp/core/src/zxing/common/GlobalHistogramBinarizer.h | 6 ++---- cpp/core/src/zxing/oned/ITFReader.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h b/cpp/core/src/zxing/common/GlobalHistogramBinarizer.h index bff84989..e38a7031 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 cached_matrix_; + Ref cached_matrix_; Ref 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 95e7a1cc..7db44f9e 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; } } -- 2.20.1