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

Merge pull request #3202 from parafin:bug_3858-2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-14 18:43:48 +00:00
commit f4f7522fe7
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/highgui/src/cap_ximea.cpp
View File

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