Merge pull request #3203 from parafin:bug_3858-3.0

10 years ago · 87f0010f42
parent 8fe18fefdd 74827c35ff
commit 87f0010f42
1 changed files with 5 additions and 3 deletions
--- a/modules/videoio/src/cap_ximea.cpp
+++ b/modules/videoio/src/cap_ximea.cpp
@ -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);