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

Merge pull request #3939 from paroj:fmtfix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-22 12:15:17 +00:00
commit 7dd19f6d97
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/out.cpp
View File

@ -309,7 +309,7 @@ namespace cv
Ptr<Formatted> format(const Mat& mtx) const
{
char braces[5] = {'[', ']', '\0', '[', ']'};
char braces[5] = {'[', ']', ',', '[', ']'};
if (mtx.cols == 1)
braces[0] = braces[1] = '\0';
return makePtr<FormattedImpl>("[", "]", mtx, &*braces,
@ -327,11 +327,11 @@ namespace cv
{
"uint8", "int8", "uint16", "int16", "int32", "float32", "float64", "uint64"
};
char braces[5] = {'[', ']', '\0', '[', ']'};
char braces[5] = {'[', ']', ',', '[', ']'};
if (mtx.cols == 1)
braces[0] = braces[1] = '\0';
return makePtr<FormattedImpl>("array([",
cv::format("], type='%s')", numpyTypes[mtx.depth()]), mtx, &*braces,
cv::format("], dtype='%s')", numpyTypes[mtx.depth()]), mtx, &*braces,
mtx.rows == 1 || !multiline, false, mtx.depth() == CV_64F ? prec64f : prec32f );
}
};