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

tweak for a gcc variant

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

5
cpp/core/src/zxing/qrcode/detector/Detector.cpp
View file

@ -35,7 +35,6 @@ using std::ostringstream;
using std::abs; using std::abs;
using std::min; using std::min;
using std::max; using std::max;
using zxing::isnan;
using zxing::qrcode::Detector; using zxing::qrcode::Detector;
using zxing::Ref; using zxing::Ref;
using zxing::BitMatrix; using zxing::BitMatrix;
@ -196,10 +195,10 @@ float Detector::calculateModuleSizeOneWay(Ref<ResultPoint> pattern, Ref<ResultPo
(int)otherPattern->getX(), (int)otherPattern->getY()); (int)otherPattern->getX(), (int)otherPattern->getY());
float moduleSizeEst2 = sizeOfBlackWhiteBlackRunBothWays((int)otherPattern->getX(), (int)otherPattern->getY(), float moduleSizeEst2 = sizeOfBlackWhiteBlackRunBothWays((int)otherPattern->getX(), (int)otherPattern->getY(),
(int)pattern->getX(), (int)pattern->getY()); (int)pattern->getX(), (int)pattern->getY());
if (isnan(moduleSizeEst1)) { if (zxing::isnan(moduleSizeEst1)) {
return moduleSizeEst2; return moduleSizeEst2;
} }
if (isnan(moduleSizeEst2)) { if (zxing::isnan(moduleSizeEst2)) {
return moduleSizeEst1; return moduleSizeEst1;
} }
// Average them, and divide by 7 since we've counted the width of 3 black modules, // Average them, and divide by 7 since we've counted the width of 3 black modules,