opencv-ximea-linux.patch

   1 --- OpenCV-2.3.1/OpenCVFindXimea.cmake.orig     2011-09-12 20:45:38.000000000 +0200
   2 +++ OpenCV-2.3.1/OpenCVFindXimea.cmake  2012-02-01 19:18:07.619900166 +0100
   3 @@ -14,15 +14,13 @@
   4  set(XIMEA_PATH)
   5  set(XIMEA_LIBRARY_DIR)
   6
   7 -# Try to find the XIMEA API path in registry.
   8 -GET_FILENAME_COMPONENT(XIMEA_PATH "[HKEY_CURRENT_USER\\Software\\XIMEA\\CamSupport\\API;Path]" ABSOLUTE)
   9 +find_file(XIMEA_INC "m3Api.h" PATHS $ENV{XIMEA_INCLUDE} "/usr/include/ximea")
  10 +find_library(XIMEA_LIB "m3api" PATHS $ENV{XIMEA_LIB} "/usr/lib${LIB_SUFFIX}")
  11
  12 -if(XIMEA_PATH)
  13 +if(XIMEA_INC AND XIMEA_LIB)
  14 +  get_filename_component(XIMEA_LIBRARY_DIR "${XIMEA_LIB}" PATH CACHE)
  15 +  get_filename_component(XIMEA_PATH "${XIMEA_INC}" PATH CACHE)
  16    set(XIMEA_FOUND 1)
  17 -
  18 -  # set LIB folders
  19 -  set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}\\x86")
  20 -
  21  else()
  22    set(XIMEA_FOUND 0)
  23  endif()
  24 --- OpenCV-2.3.1/modules/highgui/src/cap_ximea.cpp.orig 2011-09-12 20:41:29.000000000 +0200
  25 +++ OpenCV-2.3.1/modules/highgui/src/cap_ximea.cpp      2012-02-01 20:12:54.750010230 +0100
  26 @@ -1,4 +1,4 @@
  27 -
  28 +#include <cstdio>
  29  #include "precomp.hpp"
  30
  31  #include "xiApi.h"
  32 @@ -245,9 +245,7 @@
  33
  34  void CvCaptureCAM_XIMEA::errMsg(char* msg, int errNum)
  35  {
  36 -       char buf[512];
  37 -       sprintf( buf, "%s : %d\n", msg, errNum);
  38 -       OutputDebugString(buf);
  39 +       fprintf(stderr, "%s : %d\n", msg, errNum);
  40  }
  41
  42 -/**********************************************************************************/
  43 \ No newline
  44 +/**********************************************************************************/