status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-02-13 11:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor changes in the QRFinderPatternFinder.cpp

Browse Source
This commit is contained in:
favoritas37 2016-06-15 04:10:52 +03:00
parent 052615aae7
commit c7bbe4779a
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/zxing/zxing/qrcode/detector/QRFinderPatternFinder.cpp
View File

@ -50,10 +50,10 @@ public:
FurthestFromAverageComparator(float averageModuleSize) :
averageModuleSize_(averageModuleSize) {
}
bool operator()(Ref<FinderPattern> a, Ref<FinderPattern> b) {
int operator()(Ref<FinderPattern> a, Ref<FinderPattern> b) {
float dA = abs(a->getEstimatedModuleSize() - averageModuleSize_);
float dB = abs(b->getEstimatedModuleSize() - averageModuleSize_);
return dA > dB;
return dA < dB ? -1 : dA == dB ? 0 : 1;
}
};
@ -63,14 +63,14 @@ public:
CenterComparator(float averageModuleSize) :
averageModuleSize_(averageModuleSize) {
}
bool operator()(Ref<FinderPattern> a, Ref<FinderPattern> b) {
int operator()(Ref<FinderPattern> a, Ref<FinderPattern> b) {
// N.B.: we want the result in descending order ...
if (a->getCount() != b->getCount()) {
return a->getCount() > b->getCount();
return b->getCount() - a->getCount();
} else {
float dA = abs(a->getEstimatedModuleSize() - averageModuleSize_);
float dB = abs(b->getEstimatedModuleSize() - averageModuleSize_);
return dA < dB;
return dA < dB ? 1 : dA == dB ? 0 : -1;
}
}
};
@ -88,20 +88,23 @@ float FinderPatternFinder::centerFromEnd(int* stateCount, int end) {
bool FinderPatternFinder::foundPatternCross(int* stateCount) {
int totalModuleSize = 0;
for (int i = 0; i < 5; i++) {
if (stateCount[i] == 0) {
int count = stateCount[i];
if (count == 0) {
return false;
}
totalModuleSize += stateCount[i];
totalModuleSize += count;
}
if (totalModuleSize < 7) {
return false;
}
float moduleSize = (float)totalModuleSize / 7.0f;
float maxVariance = moduleSize / 2.0f;
int moduleSize = (totalModuleSize << 8) / 7;
int maxVariance = moduleSize / 2;
// Allow less than 50% variance from 1-1-3-1-1 proportions
return abs(moduleSize - stateCount[0]) < maxVariance && abs(moduleSize - stateCount[1]) < maxVariance && abs(3.0f
* moduleSize - stateCount[2]) < 3.0f * maxVariance && abs(moduleSize - stateCount[3]) < maxVariance && abs(
moduleSize - stateCount[4]) < maxVariance;
return abs(moduleSize - (stateCount[0] << 8)) < maxVariance &&
abs(moduleSize - (stateCount[1] << 8)) < maxVariance &&
abs(3.0f * moduleSize - (stateCount[2] << 8)) < 3 * maxVariance &&
abs(moduleSize - (stateCount[3] << 8)) < maxVariance &&
abs(moduleSize - (stateCount[4] << 8)) < maxVariance;
}
float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int maxCount, int originalStateCountTotal) {
@ -109,7 +112,6 @@ float FinderPatternFinder::crossCheckVertical(size_t startI, size_t centerJ, int
int maxI = image_->getHeight();
int *stateCount = getCrossCheckStateCount();
// Start counting up from center
int i = startI;
while (i >= 0 && image_->get(centerJ, i)) {