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

fix for issue 3858 (remove unneeded #include's)

Browse Source 
also use correct include path on Linux
This commit is contained in:
Igor Kuzmin 2014-09-09 19:22:20 +04:00
parent f03b11d271
commit 74827c35ff
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/videoio/src/cap_ximea.cpp
View File

@ -1,8 +1,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#ifdef WIN32
#include "xiApi.h" #include "xiApi.h"
#include "xiExt.h" #else
#include "m3Api.h" #include <m3api/xiApi.h>
#endif
/**********************************************************************************/ /**********************************************************************************/
@ -156,7 +158,7 @@ bool CvCaptureCAM_XIMEA::grabFrame()
image.size = sizeof(XI_IMG); image.size = sizeof(XI_IMG);
int mvret = xiGetImage( hmv, timeout, &image); int mvret = xiGetImage( hmv, timeout, &image);
if(mvret == MM40_ACQUISITION_STOPED) if(mvret == XI_ACQUISITION_STOPED)
{ {
xiStartAcquisition(hmv); xiStartAcquisition(hmv);
mvret = xiGetImage(hmv, timeout, &image); mvret = xiGetImage(hmv, timeout, &image);