X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cpp%2Fcore%2Fsrc%2Fzxing%2Fcommon%2FBitArray.h;h=b0b23245f8faebb4eb34d3f931683963f0dbc552;hb=cdcad8e2af288e66a22a247235bc0f6081e95215;hp=1e8828e964e5196b16e2c6297cff6bfb4585ffb6;hpb=1bd3f8056f89c3e7c5163326ce2145de97acb829;p=zxing.git diff --git a/cpp/core/src/zxing/common/BitArray.h b/cpp/core/src/zxing/common/BitArray.h index 1e8828e9..b0b23245 100644 --- a/cpp/core/src/zxing/common/BitArray.h +++ b/cpp/core/src/zxing/common/BitArray.h @@ -5,8 +5,7 @@ * BitArray.h * zxing * - * Created by Christian Brunschen on 09/05/2008. - * Copyright 2008 Google UK. All rights reserved. + * 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. @@ -23,8 +22,7 @@ #include #include -#include -#include +#include #include namespace zxing { @@ -32,7 +30,7 @@ namespace zxing { class BitArray : public Counted { private: size_t size_; - std::valarray bits_; + std::vector bits_; static const unsigned int bitsPerWord_; static const unsigned int logBits_; static const unsigned int bitsMask_; @@ -48,7 +46,7 @@ public: void setBulk(size_t i, unsigned int newBits); void clear(); bool isRange(size_t start, size_t end, bool value); - std::valarray& getBitArray(); + std::vector& getBitArray(); void reverse(); };