From fbbf4e380f7a85fb4d95f0006c4ac347de0b07f7 Mon Sep 17 00:00:00 2001 From: Igor Kuzmin Date: Tue, 9 Sep 2014 19:10:05 +0400 Subject: [PATCH] fix for issue 3858 (remove unneeded #include's) also use correct include path on Linux --- modules/highgui/src/cap_ximea.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/highgui/src/cap_ximea.cpp b/modules/highgui/src/cap_ximea.cpp index 891b961..13a4538 100644 --- 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 +#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); -- 2.7.4