Merge pull request #3202 from parafin:bug_3858-2.4

11 years ago · f4f7522fe7
parent faed8f43d6 fbbf4e380f
commit f4f7522fe7
1 changed files with 5 additions and 3 deletions
--- a/modules/highgui/src/cap_ximea.cpp
+++ b/modules/highgui/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);