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

Merge branch master into cuda-dev

Browse Source
This commit is contained in:
marina.kolpakova
2012-12-11 01:12:14 +04:00
parent 50946b59c1 67ce03d7dd
commit a6c3ed5b36
227 changed files with 2510 additions and 149006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/highgui/src/precomp.hpp
View File

@@ -115,7 +115,6 @@ CvCapture * cvCreateCameraCapture_V4L( int index );
CvCapture * cvCreateCameraCapture_DC1394( int index );
CvCapture * cvCreateCameraCapture_DC1394_2( int index );
CvCapture* cvCreateCameraCapture_MIL( int index );
CvCapture* cvCreateCameraCapture_Giganetix( int index );
CvCapture * cvCreateCameraCapture_CMU( int index );
CV_IMPL CvCapture * cvCreateCameraCapture_TYZX( int index );
CvCapture* cvCreateFileCapture_Win32( const char* filename );