diff --git a/src/zxing/zxing/LuminanceSource.h b/src/zxing/zxing/LuminanceSource.h index 5fba93e..99dcab3 100644 --- a/src/zxing/zxing/LuminanceSource.h +++ b/src/zxing/zxing/LuminanceSource.h @@ -21,7 +21,6 @@ */ #include -#include #include #include "common/Types.h" diff --git a/src/zxing/zxing/Result.h b/src/zxing/zxing/Result.h index 8bb1a99..dfeadff 100644 --- a/src/zxing/zxing/Result.h +++ b/src/zxing/zxing/Result.h @@ -21,7 +21,6 @@ */ #include -#include #include #include #include diff --git a/src/zxing/zxing/common/Array.h b/src/zxing/zxing/common/Array.h deleted file mode 100644 index 761658f..0000000 --- a/src/zxing/zxing/common/Array.h +++ /dev/null @@ -1,174 +0,0 @@ -// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- -#ifndef ZXING_ARRAY_H -#define ZXING_ARRAY_H - -/* - * Array.h - * zxing - * - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -//#include - -//namespace zxing { - -//template class Array { -//protected: -//public: -// std::vector values_; -// Array() {} -// Array(int n) : -// Counted(), values_(n, T()) { -// } -// Array(T const* ts, int n) : -// Counted(), values_(ts, ts+n) { -// } -// Array(T const* ts, T const* te) : -// Counted(), values_(ts, te) { -// } -// Array(T v, int n) : -// Counted(), values_(n, v) { -// } -// Array(std::vector &v) : -// Counted(), values_(v) { -// } -// Array(std::vector &other) : -// Counted(), values_(other.values_) { -// } -// Array(std::vector *other) : -// Counted(), values_(other->values_) { -// } -// virtual ~Array() { -// } -// std::vector& operator=(const std::vector &other) { -// values_ = other.values_; -// return *this; -// } -// std::vector& operator=(const std::vector &array) { -// values_ = array; -// return *this; -// } -// T const& operator[](int i) const { -// return values_[i]; -// } -// T& operator[](int i) { -// return values_[i]; -// } -// int size() const { -// return int(values_.size()); -// } -// bool empty() const { -// return values_.size() == 0; -// } -// std::vector const& values() const { -// return values_; -// } -// std::vector& values() { -// return values_; -// } -// void push_back(T value) { -// values_.push_back(value); -// } -//}; - -//template class ArrayRef { -//private: -//public: -// std::vector *array_; -// ArrayRef() : -// array_(0) { -// } -// explicit ArrayRef(int n) : -// array_(0) { -// reset(new std::vector (n)); -// } -// ArrayRef(T *ts, int n) : -// array_(0) { -// reset(new std::vector (ts, n)); -// } -// ArrayRef(std::vector *a) : -// array_(0) { -// reset(a); -// } -// ArrayRef(const ArrayRef &other) : -// Counted(), array_(0) { -// reset(other.array_); -// } - -// template -// ArrayRef(const QSharedPointer &other) : -// array_(0) { -// reset(static_cast *>(other.array_)); -// } - -// ~ArrayRef() { -// if (array_) { -// array_->release(); -// } -// array_ = 0; -// } - -// T const& operator[](int i) const { -// return (*array_)[i]; -// } - -// T& operator[](int i) { -// return (*array_)[i]; -// } - -// void reset(std::vector *a) { -// if (a) { -// a->retain(); -// } -// if (array_) { -// array_->release(); -// } -// array_ = a; -// } -// void reset(const QSharedPointer &other) { -// reset(other.array_); -// } -// QSharedPointer& operator=(const QSharedPointer &other) { -// reset(other); -// return *this; -// } -// QSharedPointer& operator=(std::vector *a) { -// reset(a); -// return *this; -// } - -// std::vector& operator*() const { -// return *array_; -// } - -// std::vector* operator->() const { -// return array_; -// } - -// operator bool () const { -// return array_ != 0; -// } -// bool operator ! () const { -// return array_ == 0; -// } -//}; - -//} // namespace zxing - -#endif // ZXING_ARRAY_H diff --git a/src/zxing/zxing/common/BitArray.cpp b/src/zxing/zxing/common/BitArray.cpp index af58ca1..05774b3 100644 --- a/src/zxing/zxing/common/BitArray.cpp +++ b/src/zxing/zxing/common/BitArray.cpp @@ -16,7 +16,6 @@ */ #include -#include #include #include diff --git a/src/zxing/zxing/common/BitArray.h b/src/zxing/zxing/common/BitArray.h index bc95c74..ae4ac3e 100644 --- a/src/zxing/zxing/common/BitArray.h +++ b/src/zxing/zxing/common/BitArray.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/common/BitMatrix.h b/src/zxing/zxing/common/BitMatrix.h index f03db1b..7c7acb8 100644 --- a/src/zxing/zxing/common/BitMatrix.h +++ b/src/zxing/zxing/common/BitMatrix.h @@ -23,7 +23,6 @@ #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/common/BitSource.h b/src/zxing/zxing/common/BitSource.h index e37fed5..8f35e6e 100644 --- a/src/zxing/zxing/common/BitSource.h +++ b/src/zxing/zxing/common/BitSource.h @@ -20,7 +20,6 @@ * limitations under the License. */ -#include #include namespace zxing { diff --git a/src/zxing/zxing/common/DecoderResult.h b/src/zxing/zxing/common/DecoderResult.h index d92353b..e5d986b 100644 --- a/src/zxing/zxing/common/DecoderResult.h +++ b/src/zxing/zxing/common/DecoderResult.h @@ -21,7 +21,6 @@ */ #include -#include #include #include #include diff --git a/src/zxing/zxing/common/DetectorResult.h b/src/zxing/zxing/common/DetectorResult.h index db04297..ca21cc5 100644 --- a/src/zxing/zxing/common/DetectorResult.h +++ b/src/zxing/zxing/common/DetectorResult.h @@ -21,7 +21,6 @@ */ #include -#include #include #include diff --git a/src/zxing/zxing/common/GlobalHistogramBinarizer.cpp b/src/zxing/zxing/common/GlobalHistogramBinarizer.cpp index 617fed3..44bb90d 100644 --- a/src/zxing/zxing/common/GlobalHistogramBinarizer.cpp +++ b/src/zxing/zxing/common/GlobalHistogramBinarizer.cpp @@ -20,7 +20,6 @@ #include #include -#include using zxing::Binarizer; diff --git a/src/zxing/zxing/common/GlobalHistogramBinarizer.h b/src/zxing/zxing/common/GlobalHistogramBinarizer.h index 1e1023c..a3545a4 100644 --- a/src/zxing/zxing/common/GlobalHistogramBinarizer.h +++ b/src/zxing/zxing/common/GlobalHistogramBinarizer.h @@ -23,7 +23,6 @@ #include #include #include -#include namespace zxing { diff --git a/src/zxing/zxing/common/reedsolomon/GenericGFPoly.h b/src/zxing/zxing/common/reedsolomon/GenericGFPoly.h index 0208b6b..d3c86b2 100644 --- a/src/zxing/zxing/common/reedsolomon/GenericGFPoly.h +++ b/src/zxing/zxing/common/reedsolomon/GenericGFPoly.h @@ -23,7 +23,6 @@ #define GENERICGFPOLY_H #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h b/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h index dbdf8c0..1a6430a 100644 --- a/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h +++ b/src/zxing/zxing/common/reedsolomon/ReedSolomonDecoder.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/src/zxing/zxing/common/reedsolomon/ReedSolomonEncoder.h b/src/zxing/zxing/common/reedsolomon/ReedSolomonEncoder.h index 3133fa2..c033860 100644 --- a/src/zxing/zxing/common/reedsolomon/ReedSolomonEncoder.h +++ b/src/zxing/zxing/common/reedsolomon/ReedSolomonEncoder.h @@ -3,7 +3,6 @@ #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h b/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h index cfce19f..b2f35bd 100644 --- a/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h +++ b/src/zxing/zxing/datamatrix/decoder/BitMatrixParser.h @@ -24,7 +24,6 @@ #include #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/datamatrix/decoder/DataBlock.h b/src/zxing/zxing/datamatrix/decoder/DataBlock.h index 5dfc1bf..43e00d0 100644 --- a/src/zxing/zxing/datamatrix/decoder/DataBlock.h +++ b/src/zxing/zxing/datamatrix/decoder/DataBlock.h @@ -23,7 +23,6 @@ #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h index c080678..167a67d 100644 --- a/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h +++ b/src/zxing/zxing/datamatrix/decoder/DecodedBitStreamParser.h @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/src/zxing/zxing/datamatrix/decoder/Decoder.h b/src/zxing/zxing/datamatrix/decoder/Decoder.h index 1dc6482..45baa43 100644 --- a/src/zxing/zxing/datamatrix/decoder/Decoder.h +++ b/src/zxing/zxing/datamatrix/decoder/Decoder.h @@ -23,7 +23,6 @@ #include #include -#include #include #include diff --git a/src/zxing/zxing/oned/CodaBarReader.cpp b/src/zxing/zxing/oned/CodaBarReader.cpp index 35fe1c9..26f7855 100644 --- a/src/zxing/zxing/oned/CodaBarReader.cpp +++ b/src/zxing/zxing/oned/CodaBarReader.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/Code128Reader.cpp b/src/zxing/zxing/oned/Code128Reader.cpp index f9e7c12..719632d 100644 --- a/src/zxing/zxing/oned/Code128Reader.cpp +++ b/src/zxing/zxing/oned/Code128Reader.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/Code39Reader.cpp b/src/zxing/zxing/oned/Code39Reader.cpp index b64b15f..047ea97 100644 --- a/src/zxing/zxing/oned/Code39Reader.cpp +++ b/src/zxing/zxing/oned/Code39Reader.cpp @@ -17,7 +17,6 @@ #include "Code39Reader.h" #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/Code93Reader.cpp b/src/zxing/zxing/oned/Code93Reader.cpp index 2b86471..59c7afa 100644 --- a/src/zxing/zxing/oned/Code93Reader.cpp +++ b/src/zxing/zxing/oned/Code93Reader.cpp @@ -17,7 +17,6 @@ #include "Code93Reader.h" #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/ITFReader.cpp b/src/zxing/zxing/oned/ITFReader.cpp index 94c05a3..6a32c62 100644 --- a/src/zxing/zxing/oned/ITFReader.cpp +++ b/src/zxing/zxing/oned/ITFReader.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp b/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp index 8df8a64..6a09a6d 100644 --- a/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp +++ b/src/zxing/zxing/oned/MultiFormatUPCEANReader.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/oned/rss/FinderPattern.h b/src/zxing/zxing/oned/rss/FinderPattern.h index d6e0096..8ecddaa 100644 --- a/src/zxing/zxing/oned/rss/FinderPattern.h +++ b/src/zxing/zxing/oned/rss/FinderPattern.h @@ -20,7 +20,6 @@ */ #include -#include #include diff --git a/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h b/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h index 335849c..c7e2a38 100644 --- a/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h +++ b/src/zxing/zxing/pdf417/decoder/BitMatrixParser.h @@ -24,7 +24,6 @@ #include #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h index 1e8f8bc..76f56b7 100644 --- a/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h +++ b/src/zxing/zxing/pdf417/decoder/DecodedBitStreamParser.h @@ -19,7 +19,6 @@ */ #include -#include #include #include diff --git a/src/zxing/zxing/pdf417/decoder/Decoder.h b/src/zxing/zxing/pdf417/decoder/Decoder.h index bbf26cf..64f7c57 100644 --- a/src/zxing/zxing/pdf417/decoder/Decoder.h +++ b/src/zxing/zxing/pdf417/decoder/Decoder.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h b/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h index 0e46501..04d6232 100644 --- a/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h +++ b/src/zxing/zxing/pdf417/decoder/ec/ErrorCorrection.h @@ -21,7 +21,6 @@ */ #include -#include #include #include #include diff --git a/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h b/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h index 766bb07..dfec749 100644 --- a/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h +++ b/src/zxing/zxing/pdf417/decoder/ec/ModulusGF.h @@ -19,7 +19,6 @@ */ #include -#include #include #include diff --git a/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h b/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h index c328454..4e206ac 100644 --- a/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h +++ b/src/zxing/zxing/pdf417/decoder/ec/ModulusPoly.h @@ -20,7 +20,6 @@ */ #include -#include #include #include diff --git a/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h b/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h index c973773..ee56b32 100644 --- a/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h +++ b/src/zxing/zxing/qrcode/decoder/BitMatrixParser.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/src/zxing/zxing/qrcode/decoder/DataBlock.h b/src/zxing/zxing/qrcode/decoder/DataBlock.h index 57673ca..f42ab16 100644 --- a/src/zxing/zxing/qrcode/decoder/DataBlock.h +++ b/src/zxing/zxing/qrcode/decoder/DataBlock.h @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/src/zxing/zxing/qrcode/decoder/DataMask.h b/src/zxing/zxing/qrcode/decoder/DataMask.h index 3670132..86b88a0 100644 --- a/src/zxing/zxing/qrcode/decoder/DataMask.h +++ b/src/zxing/zxing/qrcode/decoder/DataMask.h @@ -20,7 +20,6 @@ * limitations under the License. */ -#include #include #include diff --git a/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h b/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h index 82d3f39..414345e 100644 --- a/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h +++ b/src/zxing/zxing/qrcode/decoder/DecodedBitStreamParser.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/src/zxing/zxing/qrcode/decoder/Decoder.h b/src/zxing/zxing/qrcode/decoder/Decoder.h index 3ba77f1..d407c90 100644 --- a/src/zxing/zxing/qrcode/decoder/Decoder.h +++ b/src/zxing/zxing/qrcode/decoder/Decoder.h @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h b/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h index 558c438..3f33749 100644 --- a/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h +++ b/src/zxing/zxing/qrcode/detector/FinderPatternInfo.h @@ -22,7 +22,6 @@ #include #include -#include #include namespace zxing { diff --git a/src/zxing/zxing/qrcode/encoder/BlockPair.h b/src/zxing/zxing/qrcode/encoder/BlockPair.h index ea37411..3b69d67 100644 --- a/src/zxing/zxing/qrcode/encoder/BlockPair.h +++ b/src/zxing/zxing/qrcode/encoder/BlockPair.h @@ -2,7 +2,6 @@ #define BLOCKPAIR_H #include -#include #include using namespace std;