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

Merge pull request #2541 from JinoBetti:2.4

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-03-31 15:48:45 +04:00 committed by OpenCV Buildbot
commit 1f4586f3dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ public:
void write(std::ostream& out, const Mat& m, const int*, int) const void write(std::ostream& out, const Mat& m, const int*, int) const
{ {
out << "["; out << "[";
writeMat(out, m, ';', ' ', m.cols == 1); writeMat(out, m, ';', ' ', m.rows == 1);
out << "]"; out << "]";
} }
@ -165,7 +165,7 @@ public:
void write(std::ostream& out, const Mat& m, const int*, int) const void write(std::ostream& out, const Mat& m, const int*, int) const
{ {
out << "["; out << "[";
writeMat(out, m, m.cols > 1 ? '[' : ' ', '[', m.cols*m.channels() == 1); writeMat(out, m, m.cols > 1 ? '[' : ' ', '[', m.rows*m.channels() == 1);
out << "]"; out << "]";
} }
@ -187,7 +187,7 @@ public:
"uint8", "int8", "uint16", "int16", "int32", "float32", "float64", "uint64" "uint8", "int8", "uint16", "int16", "int32", "float32", "float64", "uint64"
}; };
out << "array(["; out << "array([";
writeMat(out, m, m.cols > 1 ? '[' : ' ', '[', m.cols*m.channels() == 1); writeMat(out, m, m.cols > 1 ? '[' : ' ', '[', m.rows*m.channels() == 1);
out << "], type='" << numpyTypes[m.depth()] << "')"; out << "], type='" << numpyTypes[m.depth()] << "')";
} }
@ -204,7 +204,7 @@ public:
virtual ~CSVFormatter() {} virtual ~CSVFormatter() {}
void write(std::ostream& out, const Mat& m, const int*, int) const void write(std::ostream& out, const Mat& m, const int*, int) const
{ {
writeMat(out, m, ' ', ' ', m.cols*m.channels() == 1); writeMat(out, m, ' ', ' ', m.rows*m.channels() == 1);
if(m.rows > 1) if(m.rows > 1)
out << "\n"; out << "\n";
} }
@ -223,7 +223,7 @@ public:
void write(std::ostream& out, const Mat& m, const int*, int) const void write(std::ostream& out, const Mat& m, const int*, int) const
{ {
out << "{"; out << "{";
writeMat(out, m, ',', ' ', m.cols==1); writeMat(out, m, ',', ' ', m.rows==1);
out << "}"; out << "}";
} }