Merge pull request #3203 from parafin:bug_3858-3.0

87f0010f · Vadim Pisarevsky · 8fe18fef · 74827c35 · 87f0010f
Commit 87f0010f authored Sep 14, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

cap_ximea.cpp modules/videoio/src/cap_ximea.cpp +5 -3

No files found.
--- a/modules/videoio/src/cap_ximea.cpp
+++ b/modules/videoio/src/cap_ximea.cpp
 #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);