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

datamatrix

Browse Source
This commit is contained in:
James Bowman
2011-04-21 00:47:37 +00:00
parent 4b350e9a09
commit f385bb97eb
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View File

@@ -623,14 +623,14 @@ protected:
typedef unsigned char uint8;
class DatamatrixCode {
class DataMatrixCode {
public:
char msg[4];
CvMat *original;
CvMat *corners;
};
#include <deque>
std::deque <DatamatrixCode> findcodes(CvMat *im);
std::deque <DataMatrixCode> cvFindDataMatrix(CvMat *im);
#endif

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

@@ -280,7 +280,7 @@ static deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
return r;
}
deque <DatamatrixCode> findcodes(CvMat *im)
deque <DataMatrixCode> cvFindDataMatrix(CvMat *im)
{
int r = im->rows;
int c = im->cols;
@@ -409,9 +409,9 @@ endo: ; // end search for this o
cvFree(&cxy);
cvFree(&ccxy);
deque <DatamatrixCode> rc;
deque <DataMatrixCode> rc;
for (i = 0; i < codes.size(); i++) {
DatamatrixCode cc;
DataMatrixCode cc;
strcpy(cc.msg, codes[i].msg);
cc.original = codes[i].original;
cc.corners = codes[i].sa.perim;