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

fixed bug with Mat::dataend initialization. Now morph-ex test passes; Also fixed CV_Assert() implementation

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-10-21 21:07:11 +00:00
parent 4a14795eb6
commit ebb9c61546
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/include/opencv2/highgui/highgui.hpp
View File

@@ -131,7 +131,7 @@ public:
virtual bool grab();
virtual bool retrieve(CV_OUT Mat& image, int channel=0);
virtual CV_WRAP_AS(query) VideoCapture& operator >> (Mat& image);
virtual VideoCapture& operator >> (Mat& image);
virtual bool set(int propId, double value);
virtual double get(int propId);
@@ -152,7 +152,7 @@ public:
virtual bool open(const string& filename, int fourcc, double fps,
Size frameSize, bool isColor=true);
virtual bool isOpened() const;
virtual CV_WRAP_AS(write) VideoWriter& operator << (const Mat& image);
virtual VideoWriter& operator << (const Mat& image);
protected:
Ptr<CvVideoWriter> writer;