Merge pull request opencv#8228 from csukuangfj:csukuangfj-patch

vpisarev · vpisarev · commit 5bfaf9931b5b · 2017-02-21T09:46:09.000Z
diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp
@@ -183,6 +183,12 @@ std::ostream& operator << (std::ostream& out, const Mat& mtx)
     return out << Formatter::get()->format(mtx);
 }
 
+static inline
+std::ostream& operator << (std::ostream& out, const UMat& m)
+{
+    return out << m.getMat(ACCESS_READ);
+}
+
 template<typename _Tp> static inline
 std::ostream& operator << (std::ostream& out, const Complex<_Tp>& c)
 {

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,12 @@ std::ostream& operator << (std::ostream& out, const Mat& mtx)`
`183`	`183`	`return out << Formatter::get()->format(mtx);`
`184`	`184`	`}`
`185`	`185`
	`186`	`+static inline`
	`187`	`+std::ostream& operator << (std::ostream& out, const UMat& m)`
	`188`	`+{`
	`189`	`+ return out << m.getMat(ACCESS_READ);`
	`190`	`+}`
	`191`	`+`
`186`	`192`	`template<typename _Tp> static inline`
`187`	`193`	`std::ostream& operator << (std::ostream& out, const Complex<_Tp>& c)`
`188`	`194`	`{`