mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unsafe/error-prone constructor

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2605 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2013-04-01 06:00:04 +00:00
parent 9eaaccc985
commit 71df521610
3 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cpp/core/src/zxing/common/Array.h
View file

@ -129,15 +129,6 @@ public:
#endif #endif
reset(a); reset(a);
} }
/*
ArrayRef(const Array<T> &a) :
array_(0) {
#ifdef DEBUG_COUNTING
cout << "instantiating ArrayRef " << this << " from reference to Array " << (void *)&a << ":\n";
#endif
reset(const_cast<Array<T> *>(&a));
}
*/
ArrayRef(const ArrayRef &other) : ArrayRef(const ArrayRef &other) :
Counted(), array_(0) { Counted(), array_(0) {
#ifdef DEBUG_COUNTING #ifdef DEBUG_COUNTING

11
cpp/core/src/zxing/common/Counted.h
View file

@ -96,17 +96,6 @@ public:
#endif #endif
reset(o); reset(o);
} }
/*
explicit Ref(const T &o) :
object_(0) {
#ifdef DEBUG_COUNTING
cout << "instantiating Ref " << this << " from reference\n";
#endif
reset(const_cast<T *>(&o));
}
*/
Ref(const Ref &other) : Ref(const Ref &other) :
object_(0) { object_(0) {
#ifdef DEBUG_COUNTING #ifdef DEBUG_COUNTING

4
cpp/core/tests/src/common/BlackPointEstimatorTest.cpp
View file

@ -30,8 +30,8 @@ void BlackPointEstimatorTest::testBasic() {
int histogramRaw[] = { 0, 0, 11, 43, 37, 18, 3, 1, 0, 0, 13, 36, 24, 0, 11, 2 }; int histogramRaw[] = { 0, 0, 11, 43, 37, 18, 3, 1, 0, 0, 13, 36, 24, 0, 11, 2 };
vector<int> histogram(histogramRaw, histogramRaw+16); vector<int> histogram(histogramRaw, histogramRaw+16);
ArrayRef<int> array (new Array<int>(histogram)); ArrayRef<int> array (new Array<int>(histogram));
size_t point = GlobalHistogramBinarizer::estimateBlackPoint(array); int point = GlobalHistogramBinarizer::estimateBlackPoint(array);
CPPUNIT_ASSERT_EQUAL((size_t)64, point); CPPUNIT_ASSERT_EQUAL((int)64, point);
} }
void BlackPointEstimatorTest::testTooLittleRange() { void BlackPointEstimatorTest::testTooLittleRange() {