Update to 2.0.0 tree from current Fremantle build

[opencv] / interfaces / swig / general / highgui.i

diff --git a/interfaces/swig/general/highgui.i b/interfaces/swig/general/highgui.i
index c3c767f..2dc244a 100644 (file)
--- a/interfaces/swig/general/highgui.i
+++ b/interfaces/swig/general/highgui.i
@@ -79,11 +79,12 @@ CvMat * cvLoadImageMat(const char* filename, int iscolor=CV_LOAD_IMAGE_COLOR ){
 %typemap_out_CvMat(cvRetrieveFrame, ( CvCapture* capture ), (capture));
 %typemap_out_CvMat(cvQueryFrame, ( CvCapture * capture ), (capture));
 
-/* Prototype for CV_FOURCC so that swig can generate wrapper */
-int CV_FOURCC(char c1, char c2, char c3, char c4);
-
 %include "highgui.h"
 
+struct CvCapture {
+};
+struct CvVideoWriter {
+};
 %extend CvCapture     { ~CvCapture ()     { CvCapture *     dummy = self; cvReleaseCapture     (& dummy); } }
 %extend CvVideoWriter { ~CvVideoWriter () { CvVideoWriter * dummy = self; cvReleaseVideoWriter (& dummy); } }