From 128e5095277f0692cec8e8bded7dfffedd267177 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 23 Dec 2014 17:10:33 +0300 Subject: [PATCH] Added enviroment search paths for OpenNI2 for linux and fixed specific warning --- cmake/OpenCVFindOpenNI2.cmake | 4 ++-- modules/videoio/src/cap_openni2.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/OpenCVFindOpenNI2.cmake b/cmake/OpenCVFindOpenNI2.cmake index fc4f153cf3..08e55e6a2b 100644 --- a/cmake/OpenCVFindOpenNI2.cmake +++ b/cmake/OpenCVFindOpenNI2.cmake @@ -21,8 +21,8 @@ if(WIN32) find_library(OPENNI2_LIBRARY "OpenNI2" PATHS $ENV{OPENNI2_LIB64} DOC "OpenNI2 library") endif() elseif(UNIX OR APPLE) - find_file(OPENNI2_INCLUDES "OpenNI.h" PATHS "/usr/include/ni2" "/usr/include/openni2" DOC "OpenNI2 c++ interface header") - find_library(OPENNI2_LIBRARY "OpenNI2" PATHS "/usr/lib" DOC "OpenNI2 library") + find_file(OPENNI2_INCLUDES "OpenNI.h" PATHS "/usr/include/ni2" "/usr/include/openni2" $ENV{OPENNI2_INCLUDE} DOC "OpenNI2 c++ interface header") + find_library(OPENNI2_LIBRARY "OpenNI2" PATHS "/usr/lib" $ENV{OPENNI2_REDIST} DOC "OpenNI2 library") endif() if(OPENNI2_LIBRARY AND OPENNI2_INCLUDES) diff --git a/modules/videoio/src/cap_openni2.cpp b/modules/videoio/src/cap_openni2.cpp index 92d9db8f26..04f4d10c0d 100644 --- a/modules/videoio/src/cap_openni2.cpp +++ b/modules/videoio/src/cap_openni2.cpp @@ -821,10 +821,10 @@ IplImage* CvCapture_OpenNI2::retrieveValidDepthMask() if (!depthFrame.isValid()) return 0; - cv::Mat depth; - getDepthMapFromMetaData(depthFrame, depth, noSampleValue, shadowValue); + cv::Mat d; + getDepthMapFromMetaData(depthFrame, d, noSampleValue, shadowValue); - outputMaps[CV_CAP_OPENNI_VALID_DEPTH_MASK].mat = depth != CvCapture_OpenNI2::INVALID_PIXEL_VAL; + outputMaps[CV_CAP_OPENNI_VALID_DEPTH_MASK].mat = d != CvCapture_OpenNI2::INVALID_PIXEL_VAL; return outputMaps[CV_CAP_OPENNI_VALID_DEPTH_MASK].getIplImagePtr(); }