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

Remove all using directives for STL namespace and members

Browse Source 
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
This commit is contained in:
Andrey Kamaev
2013-02-24 20:14:01 +04:00
parent f783f34e0b
commit 2a6fb2867e
310 changed files with 5744 additions and 5964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
modules/objdetect/src/datamatrix.cpp
View File

@@ -1,17 +1,8 @@
#include "precomp.hpp"
#if CV_SSE2
#include <xmmintrin.h>
#endif
#include <deque>
#include <algorithm>
using namespace std;
#undef NDEBUG
#include <assert.h>
class Sampler {
public:
CvMat *im;
@@ -310,7 +301,7 @@ static int decode(Sampler &sa, code &cc)
}
}
static deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
static std::deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
{
CvPoint np;
/* Return the last 10th of the trail of points following v from (x,y)
@@ -319,7 +310,7 @@ static deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
int ex = x + ((short*)cvPtr2D(terminal, y, x))[0];
int ey = y + ((short*)cvPtr2D(terminal, y, x))[1];
deque<CvPoint> r;
std::deque<CvPoint> r;
while ((x != ex) || (y != ey)) {
np.x = x;
np.y = y;
@@ -338,7 +329,7 @@ static deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
}
#endif
deque <CvDataMatrixCode> cvFindDataMatrix(CvMat *im)
std::deque <CvDataMatrixCode> cvFindDataMatrix(CvMat *im)
{
#if CV_SSE2
int r = im->rows;
@@ -386,7 +377,7 @@ deque <CvDataMatrixCode> cvFindDataMatrix(CvMat *im)
cfollow(vc, cxy);
cfollow(vcc, ccxy);
deque <CvPoint> candidates;
std::deque <CvPoint> candidates;
{
int x, y;
int rows = cxy->rows;
@@ -437,13 +428,13 @@ deque <CvDataMatrixCode> cvFindDataMatrix(CvMat *im)
}
}
deque <code> codes;
std::deque <code> codes;
size_t i, j, k;
while (!candidates.empty()) {
CvPoint o = candidates.front();
candidates.pop_front();
deque<CvPoint> ptc = trailto(vc, o.x, o.y, cxy);
deque<CvPoint> ptcc = trailto(vcc, o.x, o.y, ccxy);
std::deque<CvPoint> ptc = trailto(vc, o.x, o.y, cxy);
std::deque<CvPoint> ptcc = trailto(vcc, o.x, o.y, ccxy);
for (j = 0; j < ptc.size(); j++) {
for (k = 0; k < ptcc.size(); k++) {
code cc;
@@ -476,7 +467,7 @@ endo: ; // end search for this o
cvReleaseMat(&cxy);
cvReleaseMat(&ccxy);
deque <CvDataMatrixCode> rc;
std::deque <CvDataMatrixCode> rc;
for (i = 0; i < codes.size(); i++) {
CvDataMatrixCode cc;
strcpy(cc.msg, codes[i].msg);
@@ -487,7 +478,7 @@ endo: ; // end search for this o
return rc;
#else
(void)im;
deque <CvDataMatrixCode> rc;
std::deque <CvDataMatrixCode> rc;
return rc;
#endif
}
@@ -498,13 +489,13 @@ namespace cv
{
void findDataMatrix(InputArray _image,
vector<string>& codes,
std::vector<std::string>& codes,
OutputArray _corners,
OutputArrayOfArrays _dmtx)
{
Mat image = _image.getMat();
CvMat m(image);
deque <CvDataMatrixCode> rc = cvFindDataMatrix(&m);
std::deque <CvDataMatrixCode> rc = cvFindDataMatrix(&m);
int i, n = (int)rc.size();
Mat corners;
@@ -522,7 +513,7 @@ void findDataMatrix(InputArray _image,
for( i = 0; i < n; i++ )
{
CvDataMatrixCode& rc_i = rc[i];
codes[i] = string(rc_i.msg);
codes[i] = std::string(rc_i.msg);
if( corners.data )
{
@@ -544,7 +535,7 @@ void findDataMatrix(InputArray _image,
}
void drawDataMatrixCodes(InputOutputArray _image,
const vector<string>& codes,
const std::vector<std::string>& codes,
InputArray _corners)
{
Mat image = _image.getMat();