OpenCV-2.4.1-XIMEA-Linux.patch

Igor Kuzmin, 2012-06-26 12:36 pm

Download (2.4 kB)

 
OpenCV-2.4.1-linux/cmake/OpenCVFindXimea.cmake 2012-06-26 14:33:10.270883711 +0400
8 8
#  XIMEA_LIBRARY_DIR    - XIMEA libraries folder
9 9
#
10 10
# Created: 5 Aug 2011 by Marian Zajko ([email protected])
11
# Updated: 25 June 2012 by Igor Kuzmin ([email protected])
11 12
#
12 13

  
13 14
set(XIMEA_FOUND)
......
26 27

  
27 28
  else()
28 29
    set(XIMEA_FOUND 0)
30
  endif()
31
else()
32
	if(EXISTS /opt/XIMEA)
33
    set(XIMEA_FOUND 1)
34

  
35
    # set folders
36
    set(XIMEA_LIBRARY_DIR "/usr/lib")
37
	set(XIMEA_PATH "/opt/XIMEA/include")
38

  
39
  else()
40
    set(XIMEA_FOUND 0)
29 41
  endif()
30 42
endif()
31 43

  
OpenCV-2.4.1-linux/CMakeLists.txt 2012-06-26 14:33:10.270883711 +0400
134 134
OCV_OPTION(WITH_UNICAP         "Include Unicap support (GPL)"                OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID AND NOT IOS) )
135 135
OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON   IF (UNIX AND NOT APPLE AND NOT ANDROID AND NOT IOS) )
136 136
OCV_OPTION(WITH_VIDEOINPUT     "Build HighGUI with DirectShow support"       ON   IF WIN32 )
137
OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF WIN32 )
137
OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID AND NOT IOS AND NOT APPLE) )
138 138
OCV_OPTION(WITH_XINE           "Include Xine support (GPL)"                  OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID AND NOT IOS) )
139 139

  
140 140
# OpenCV build components
OpenCV-2.4.1-linux/modules/highgui/src/cap_ximea.cpp 2012-06-26 14:35:24.478878778 +0400
279 279

  
280 280
void CvCaptureCAM_XIMEA::errMsg(char* msg, int errNum)
281 281
{
282
#ifdef linux
283
	fprintf(stderr, "%s : %d\n", msg, errNum);
284
#else
282 285
	char buf[512];
283 286
	sprintf( buf, "%s : %d\n", msg, errNum);
284 287
	OutputDebugString(buf);
288
#endif
285 289
}
286 290

  
287
/**********************************************************************************/
291
/**********************************************************************************/