extended out << mat/vec operators; added opencv license

modules/core/include/opencv2/core/core.hpp

@@ -4055,6 +4055,5 @@ public:
 
 #include "opencv2/core/operations.hpp"
 #include "opencv2/core/mat.hpp"
-#include "opencv2/core/cvout.hpp"
 
 #endif /*__OPENCV_CORE_HPP__*/

modules/core/include/opencv2/core/cvout.hpp

@@ -1,79 +0,0 @@
-#ifndef __OPENCV_CORE_CVOUT_HPP__
-#define __OPENCV_CORE_CVOUT_HPP__
-#ifdef __cplusplus
-
-#ifndef SKIP_INCLUDES
-  #include <iomanip>
-  #include <iostream>
-  #include <vector>
-#endif
-
-namespace cv
-{
-
-/** Writes a point to an output stream in Matlab notation
- */
-inline std::ostream & operator<<(std::ostream & out, const Point2f & p)
-{
-  out << "[ " << p.x << "," << p.y << " ]";
-  return out;
-}
-
-/** Writes a point to an output stream in Matlab notation
- */
-inline std::ostream & operator<<(std::ostream & out, const Point3f & p)
-{
-  out << "[ " << p.x << "," << p.y << "," << p.z << " ]";
-  return out;
-}
-
-/** \brief	 write points to and output stream
- *  \param out typically cout
- *  \param points the points to be written to the stream
- *  \return	 the stream
- **/
-CV_EXPORTS std::ostream & operator<<(std::ostream & out, const std::vector<Point2f> & points);
-
-/** \brief	 write points to and output stream
- *  \param out typically cout
- *  \param points the points to be written to the stream
- *  \return	 the stream
- **/
-std::ostream & operator<<(std::ostream & out, const std::vector<Point3f> & points);
-
-/** \brief allows each output of Mat in Matlab for Mat to std::cout
- * use like
- @verbatim
- Mat my_mat = Mat::eye(3,3,CV_32F);
- std::cout << my_mat;
- @endverbatim
- */
-CV_EXPORTS std::ostream & operator<<(std::ostream & out, const Mat & mat);
-
-/** \brief write a Mat in csv compatible for Matlab.
- This means that the rows are seperated by newlines and the
- columns by commas ....
- 331.413896619595,0,122.365880226491
- 0,249.320451610369,122.146722131871
- 0,0,1
-
- *	\param out output stream to write to
- *	\param Mat write a Mat to a csv
- */
-CV_EXPORTS std::ostream & writeCSV(std::ostream & out, const Mat & mat);
-
-/** \brief write a vector of points to an
- output stream if possible
- **/
-CV_EXPORTS std::ostream & writeCSV(std::ostream & out, const std::vector<Point2f> & points);
-
-/** \brief write a vector of points to an
- output stream if possible
- **/
-CV_EXPORTS std::ostream & writeCSV(std::ostream & out, const std::vector<Point3f> & points);
-
-} //namespace cv
-
-#endif
-
-#endif

modules/core/include/opencv2/core/operations.hpp

@@ -3495,6 +3495,107 @@ public:
         return new _ClsName(*(const _ClsName*)ptr);
     }
 };
+
+    
+class CV_EXPORTS Formatter
+{
+public:
+    virtual ~Formatter() {}
+    virtual void write(std::ostream& out, const Mat& m, const int* params=0, int nparams=0) const = 0;
+    virtual void write(std::ostream& out, const void* data, int nelems, int type,
+                       const int* params=0, int nparams=0) const = 0;
+    static const Formatter* get(const char* fmt="");
+    static const Formatter* setDefault(const Formatter* fmt);
+};
+
+
+struct CV_EXPORTS Formatted
+{
+    Formatted(const Mat& m, const Formatter* fmt,
+              const vector<int>& params);
+    Formatted(const Mat& m, const Formatter* fmt,
+              const int* params=0);
+    Mat mtx;
+    const Formatter* fmt;
+    vector<int> params;
+};
+
+    
+/** Writes a point to an output stream in Matlab notation
+ */
+template<typename _Tp> inline std::ostream& operator<<(std::ostream& out, const Point_<_Tp>& p)
+{
+    out << "[" << p.x << ", " << p.y << "]";
+    return out;
+}
+
+/** Writes a point to an output stream in Matlab notation
+ */
+template<typename _Tp> inline std::ostream& operator<<(std::ostream& out, const Point3_<_Tp>& p)
+{
+    out << "[" << p.x << ", " << p.y << ", " << p.z << "]";
+    return out;
+}        
+
+static inline Formatted format(const Mat& mtx, const char* fmt,
+                               const vector<int>& params=vector<int>())
+{
+    return Formatted(mtx, Formatter::get(fmt), params);
+}
+
+template<typename _Tp> static inline Formatted format(const vector<Point_<_Tp> >& vec,
+                                                      const char* fmt, const vector<int>& params=vector<int>())
+{
+    return Formatted(Mat(vec), Formatter::get(fmt), params);
+}
+
+template<typename _Tp> static inline Formatted format(const vector<Point3_<_Tp> >& vec,
+                                                      const char* fmt, const vector<int>& params=vector<int>())
+{
+    return Formatted(Mat(vec), Formatter::get(fmt), params);
+}
+
+/** \brief prints Mat to the output stream in Matlab notation
+ * use like
+ @verbatim
+ Mat my_mat = Mat::eye(3,3,CV_32F);
+ std::cout << my_mat;
+ @endverbatim
+ */    
+static inline std::ostream& operator << (std::ostream& out, const Mat& mtx)
+{
+    Formatter::get()->write(out, mtx);
+    return out;
+}
+
+/** \brief prints Mat to the output stream allows in the specified notation (see format)
+ * use like
+ @verbatim
+ Mat my_mat = Mat::eye(3,3,CV_32F);
+ std::cout << my_mat;
+ @endverbatim
+ */    
+static inline std::ostream& operator << (std::ostream& out, const Formatted& fmtd)
+{
+    fmtd.fmt->write(out, fmtd.mtx);
+    return out;
+}
+
+
+template<typename _Tp> static inline std::ostream& operator << (std::ostream& out,
+                                                                const vector<Point_<_Tp> >& vec)
+{
+    Formatter::get()->write(out, Mat(vec));
+    return out;
+}
+
+
+template<typename _Tp> static inline std::ostream& operator << (std::ostream& out,
+                                                                const vector<Point3_<_Tp> >& vec)
+{
+    Formatter::get()->write(out, Mat(vec));
+    return out;
+}
     
 }