Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea

cmake/OpenCVFindXimea.cmake

@@ -23,7 +23,7 @@ if(WIN32)
   if(EXISTS ${XIMEA_PATH})
     set(XIMEA_FOUND 1)
     # set LIB folders
-    if(CMAKE_CL_64)
+    if(X86_64)
       set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}/x64")
     else()
       set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}/x86")

modules/highgui/CMakeLists.txt

@@ -167,9 +167,9 @@ if(HAVE_XIMEA)
   list(APPEND highgui_srcs src/cap_ximea.cpp)
   ocv_include_directories(${XIMEA_PATH})
   if(XIMEA_LIBRARY_DIR)
-    link_directories(${XIMEA_LIBRARY_DIR})
+    link_directories("${XIMEA_LIBRARY_DIR}")
   endif()
-  if(CMAKE_CL_64)
+  if(X86_64)
     list(APPEND HIGHGUI_LIBRARIES m3apiX64)
   else()
     list(APPEND HIGHGUI_LIBRARIES m3api)

modules/highgui/src/cap_ximea.cpp

@@ -75,34 +75,35 @@ bool CvCaptureCAM_XIMEA::open( int wIndex )
         return false;
     }
 
+    int width   = 0;
+    int height  = 0;
+    int isColor = 0;
+
     // always use auto exposure/gain
     mvret = xiSetParamInt( hmv, XI_PRM_AEAG, 1);
     HandleXiResult(mvret);
 
-    int width = 0;
     mvret = xiGetParamInt( hmv, XI_PRM_WIDTH, &width);
     HandleXiResult(mvret);
 
-    int height = 0;
     mvret = xiGetParamInt( hmv, XI_PRM_HEIGHT, &height);
     HandleXiResult(mvret);
 
-    int isColor = 0;
     mvret = xiGetParamInt(hmv, XI_PRM_IMAGE_IS_COLOR, &isColor);
     HandleXiResult(mvret);
 
-    if(isColor)	// for color cameras
+    if(isColor) // for color cameras
     {
         // default image format RGB24
         mvret = xiSetParamInt( hmv, XI_PRM_IMAGE_DATA_FORMAT, XI_RGB24);
         HandleXiResult(mvret);
 
-        // always use auto white ballance for color cameras
+        // always use auto white balance for color cameras
         mvret = xiSetParamInt( hmv, XI_PRM_AUTO_WB, 1);
         HandleXiResult(mvret);
 
         // allocate frame buffer for RGB24 image
-        frame = cvCreateImage(cvSize( width, height), IPL_DEPTH_8U, 3);
+        frame = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
     }
     else // for mono cameras
     {
@@ -111,7 +112,7 @@ bool CvCaptureCAM_XIMEA::open( int wIndex )
         HandleXiResult(mvret);
 
         // allocate frame buffer for MONO8 image
-        frame = cvCreateImage(cvSize( width, height), IPL_DEPTH_8U, 1);
+        frame = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 1);
     }
 
     //default capture timeout 10s