status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better aligned implementation of WhiteRectangleDetector with the Java implementation

This commit is contained in:
favoritas37 2016-09-27 02:08:03 +03:00
parent d5e5c895d8
commit 52262cb0d2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/zxing/zxing/common/detector/WhiteRectangleDetector.cpp
View File

@ -33,21 +33,23 @@ using zxing::common::detector::MathUtils;
// VC++
using zxing::BitMatrix;
int WhiteRectangleDetector::INIT_SIZE = 30;
int WhiteRectangleDetector::INIT_SIZE = 30; //note, why 30, not 10
int WhiteRectangleDetector::CORR = 1;
WhiteRectangleDetector::WhiteRectangleDetector(Ref<BitMatrix> image) : image_(image) {
width_ = image->getWidth();
height_ = image->getHeight();
WhiteRectangleDetector::WhiteRectangleDetector(Ref<BitMatrix> image) :
WhiteRectangleDetector(image, INIT_SIZE, image->getWidth() >> 1, image->getHeight() >> 1)
{
//// width_ = image->getWidth();
//// height_ = image->getHeight();
leftInit_ = (width_ - INIT_SIZE) >> 1;
rightInit_ = (width_ + INIT_SIZE) >> 1;
upInit_ = (height_ - INIT_SIZE) >> 1;
downInit_ = (height_ + INIT_SIZE) >> 1;
//// leftInit_ = (width_ - INIT_SIZE) >> 1;
//// rightInit_ = (width_ + INIT_SIZE) >> 1;
//// upInit_ = (height_ - INIT_SIZE) >> 1;
//// downInit_ = (height_ + INIT_SIZE) >> 1;
if (upInit_ < 0 || leftInit_ < 0 || downInit_ >= height_ || rightInit_ >= width_) {
throw NotFoundException("Invalid dimensions WhiteRectangleDetector");
}
// if (upInit_ < 0 || leftInit_ < 0 || downInit_ >= height_ || rightInit_ >= width_) {
// throw NotFoundException("Invalid dimensions WhiteRectangleDetector");
//}
}
WhiteRectangleDetector::WhiteRectangleDetector(Ref<BitMatrix> image, int initSize, int x, int y) : image_(image) {