Fix notes about cmake files. Fix build warning.

cmake/OpenCVFindIntelPerCSDK.cmake

 # Main variables:
-# INTELPERC_LIBRARY and INTELPERC_INCLUDES to link Intel Perceptial Computing SDK modules
+# INTELPERC_LIBRARIES and INTELPERC_INCLUDE to link Intel Perceptial Computing SDK modules
 # HAVE_INTELPERC for conditional compilation OpenCV with/without Intel Perceptial Computing SDK
 
-if(NOT "${INTELPERC_LIB_DIR}" STREQUAL "${INTELPERC_LIB_DIR_INTERNAL}")
-    unset(INTELPERC_LIBRARY CACHE)
-    unset(INTELPERC_LIB_DIR CACHE)
-endif()
-
-if(NOT "${INTELPERC_INCLUDE_DIR}" STREQUAL "${INTELPERC_INCLUDE_DIR_INTERNAL}")
-    unset(INTELPERC_INCLUDES CACHE)
-    unset(INTELPERC_INCLUDE_DIR CACHE)
-endif()
-
-if(WIN32)
-    if(NOT (MSVC64 OR MINGW64))
-        find_file(INTELPERC_INCLUDES "pxcsession.h" PATHS "$ENV{PCSDK_DIR}include" DOC "Intel Perceptual Computing SDK interface header")
-        find_library(INTELPERC_LIBRARY "libpxc.lib" PATHS "$ENV{PCSDK_DIR}lib/Win32" DOC "Intel Perceptual Computing SDK library")
-    else()
-        find_file(INTELPERC_INCLUDES "pxcsession.h" PATHS "$ENV{PCSDK_DIR}include" DOC "Intel Perceptual Computing SDK interface header")
-        find_library(INTELPERC_LIBRARY "libpxc.lib" PATHS "$ENV{PCSDK_DIR}/lib/x64" DOC "Intel Perceptual Computing SDK library")
-    endif()
-endif()
-
-if(INTELPERC_LIBRARY AND INTELPERC_INCLUDES)
-    set(HAVE_INTELPERC TRUE)
-endif() #if(INTELPERC_LIBRARY AND INTELPERC_INCLUDES)
-
-get_filename_component(INTELPERC_LIB_DIR "${INTELPERC_LIBRARY}" PATH)
-get_filename_component(INTELPERC_INCLUDE_DIR "${INTELPERC_INCLUDES}" PATH)
-
-if(HAVE_INTELPERC)
-  set(INTELPERC_LIB_DIR "${INTELPERC_LIB_DIR}" CACHE PATH "Path to Intel Perceptual Computing SDK interface libraries" FORCE)
-  set(INTELPERC_INCLUDE_DIR "${INTELPERC_INCLUDE_DIR}" CACHE PATH "Path to Intel Perceptual Computing SDK interface headers" FORCE)
-endif()
-
-if(INTELPERC_LIBRARY)
-    set(INTELPERC_LIB_DIR_INTERNAL "${INTELPERC_LIB_DIR}" CACHE INTERNAL "This is the value of the last time INTELPERC_LIB_DIR was set successfully." FORCE)
+if(X86_64)
+    find_path(INTELPERC_INCLUDE_DIR "pxcsession.h" PATHS "$ENV{PCSDK_DIR}include" DOC "Path to Intel Perceptual Computing SDK interface headers")
+    find_file(INTELPERC_LIBRARIES "libpxc.lib" PATHS "$ENV{PCSDK_DIR}lib/x64" DOC "Path to Intel Perceptual Computing SDK interface libraries")
 else()
-    message( WARNING, " Intel Perceptual Computing SDK library directory (set by INTELPERC_LIB_DIR variable) is not found or does not have Intel Perceptual Computing SDK libraries." )
+    find_path(INTELPERC_INCLUDE_DIR "pxcsession.h" PATHS "$ENV{PCSDK_DIR}include" DOC "Path to Intel Perceptual Computing SDK interface headers")
+    find_file(INTELPERC_LIBRARIES "libpxc.lib" PATHS "$ENV{PCSDK_DIR}lib/Win32" DOC "Path to Intel Perceptual Computing SDK interface libraries")
 endif()
 
-if(INTELPERC_INCLUDES)
-    set(INTELPERC_INCLUDE_DIR_INTERNAL "${INTELPERC_INCLUDE_DIR}" CACHE INTERNAL "This is the value of the last time INTELPERC_INCLUDE_DIR was set successfully." FORCE)
+if(INTELPERC_INCLUDE_DIR AND INTELPERC_LIBRARIES)
+    set(HAVE_INTELPERC TRUE)
 else()
-    message( WARNING, " Intel Perceptual Computing SDK include directory (set by INTELPERC_INCLUDE_DIR variable) is not found or does not have Intel Perceptual Computing SDK include files." )
-endif()
-
-mark_as_advanced(FORCE INTELPERC_LIBRARY)
-mark_as_advanced(FORCE INTELPERC_INCLUDES)
+    set(HAVE_INTELPERC FALSE)
+    message(WARNING "Intel Perceptual Computing SDK library directory (set by INTELPERC_LIB_DIR variable) is not found or does not have Intel Perceptual Computing SDK libraries.")
+endif() #if(INTELPERC_INCLUDE_DIR AND INTELPERC_LIBRARIES)
 
+mark_as_advanced(FORCE INTELPERC_LIBRARIES INTELPERC_INCLUDE_DIR)
\ No newline at end of file

cmake/OpenCVFindLibsVideo.cmake

@@ -252,7 +252,6 @@ if (NOT IOS)
 endif()
 
 # --- Intel Perceptual Computing SSDK ---
-ocv_clear_vars(HAVE_INTELPERC)
 if(WITH_INTELPERC)
   include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindIntelPerCSDK.cmake")
 endif(WITH_INTELPERC)

cmake/templates/cvconfig.h.in

@@ -85,6 +85,9 @@
 /* Apple ImageIO Framework */
 #cmakedefine HAVE_IMAGEIO
 
+/* Intel Perceptual Computing SDK library */
+#cmakedefine HAVE_INTELPERC
+
 /* Intel Integrated Performance Primitives */
 #cmakedefine HAVE_IPP
 
@@ -158,9 +161,6 @@
 /* Xine video library */
 #cmakedefine HAVE_XINE
 
-/* Intel Perceptual Computing SDK library */
-#cmakedefine HAVE_INTELPERC
-
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN

doc/user_guide/ug_intelperc.rst

@@ -77,4 +77,3 @@ Since two types of sensor's data generators are supported (image generator and d
 For more information please refer to the example of usage intelperc_capture.cpp_ in ``opencv/samples/cpp`` folder.
 
 .. _intelperc_capture.cpp: https://github.com/Itseez/opencv/tree/master/samples/cpp/intelperc_capture.cpp
\ No newline at end of file
-

modules/highgui/CMakeLists.txt

@@ -221,7 +221,7 @@ endif()
 if(HAVE_INTELPERC)
   list(APPEND highgui_srcs src/cap_intelperc.cpp)
   ocv_include_directories(${INTELPERC_INCLUDE_DIR})
-  list(APPEND HIGHGUI_LIBRARIES ${INTELPERC_LIBRARY})
+  list(APPEND HIGHGUI_LIBRARIES ${INTELPERC_LIBRARIES})
 endif(HAVE_INTELPERC)
 
 if(IOS)

modules/highgui/include/opencv2/highgui/highgui_c.h

@@ -469,9 +469,9 @@ enum
     CV_CAP_PROP_GIGA_FRAME_WIDTH_MAX = 10003,
     CV_CAP_PROP_GIGA_FRAME_HEIGH_MAX = 10004,
     CV_CAP_PROP_GIGA_FRAME_SENS_WIDTH = 10005,
-    CV_CAP_PROP_GIGA_FRAME_SENS_HEIGH = 10006
+    CV_CAP_PROP_GIGA_FRAME_SENS_HEIGH = 10006,
 
-    ,CV_CAP_PROP_INTELPERC_PROFILE_COUNT        = 11001,
+    CV_CAP_PROP_INTELPERC_PROFILE_COUNT               = 11001,
     CV_CAP_PROP_INTELPERC_PROFILE_IDX                 = 11002,
     CV_CAP_PROP_INTELPERC_DEPTH_LOW_CONFIDENCE_VALUE  = 11003,
     CV_CAP_PROP_INTELPERC_DEPTH_SATURATION_VALUE      = 11004,
@@ -480,8 +480,8 @@ enum
     CV_CAP_PROP_INTELPERC_DEPTH_FOCAL_LENGTH_VERT     = 11007,
 
     // Intel PerC streams
-    CV_CAP_INTELPERC_DEPTH_GENERATOR = 1 << 31,
-    CV_CAP_INTELPERC_IMAGE_GENERATOR = 1 << 30,
+    CV_CAP_INTELPERC_DEPTH_GENERATOR = 1 << 29,
+    CV_CAP_INTELPERC_IMAGE_GENERATOR = 1 << 28,
     CV_CAP_INTELPERC_GENERATORS_MASK = CV_CAP_INTELPERC_DEPTH_GENERATOR + CV_CAP_INTELPERC_IMAGE_GENERATOR,
 };
 

samples/cpp/intelperc_capture.cpp

@@ -3,7 +3,6 @@
 
 #include <tchar.h>
 #include "opencv2/highgui/highgui.hpp"
-//#include "opencv2/imgproc/imgproc.hpp"
 
 #include <iostream>
 
@@ -376,4 +375,3 @@ int _tmain(int argc, char* argv[])
 
     return 0;
 }
\ No newline at end of file
-