Drop cv:: prefix from cv::String used inside the cv namespace

This commit is contained in:
Andrey Kamaev
2013-03-22 20:37:49 +04:00
parent 75513a46dc
commit be7bbe3aa9
122 changed files with 1077 additions and 1077 deletions

View File

@@ -489,7 +489,7 @@ namespace cv
{
void findDataMatrix(InputArray _image,
std::vector<cv::String>& codes,
std::vector<String>& codes,
OutputArray _corners,
OutputArrayOfArrays _dmtx)
{
@@ -513,7 +513,7 @@ void findDataMatrix(InputArray _image,
for( i = 0; i < n; i++ )
{
CvDataMatrixCode& rc_i = rc[i];
codes[i] = cv::String(rc_i.msg);
codes[i] = String(rc_i.msg);
if( corners.data )
{
@@ -535,7 +535,7 @@ void findDataMatrix(InputArray _image,
}
void drawDataMatrixCodes(InputOutputArray _image,
const std::vector<cv::String>& codes,
const std::vector<String>& codes,
InputArray _corners)
{
Mat image = _image.getMat();