Skip to content

O
opencv
Commit 87f0010f authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #3203 from parafin:bug_3858-3.0

parents 8fe18fef 74827c35
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/videoio/src/cap_ximea.cpp
View file @ 87f0010f
#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() ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment