generic-library/zxing-cpp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #15 from dushibaiyu/master

Browse Source 
change cstdlib abs to cmath abs(float). in mingw 4.9.1 abs(in castlib…
This commit is contained in:
Benjamin Dobell 2015-05-26 13:19:47 +10:00
commit d34acfd518
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/zxing/pdf417/detector/LinesSampler.cpp
View File

@ -1,4 +1,4 @@
// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
/*
* Copyright 2010, 2012 ZXing authors All rights reserved.
*
@ -21,11 +21,12 @@
#include <zxing/NotFoundException.h>
#include <zxing/common/Point.h>
#include <algorithm> // vs12, std::min und std:max
#include <cmath>
using std::map;
using std::vector;
using std::min;
using std::abs;
//using std::abs;
using zxing::pdf417::detector::LinesSampler;
using zxing::pdf417::decoder::BitMatrixParser;
using zxing::Ref;
@ -62,7 +63,7 @@ class VoteResult {
this->vote = vote;
}
};
VoteResult getValueWithMaxVotes(map<int, int>& votes) {
VoteResult result;
int maxVotes = 0;