generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3539 from mshabunin:openni-linux-paths

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-12-26 12:12:01 +00:00
commit f85838087a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVFindOpenNI2.cmake
View File

@ -21,8 +21,8 @@ if(WIN32)
find_library(OPENNI2_LIBRARY "OpenNI2" PATHS $ENV{OPENNI2_LIB64} DOC "OpenNI2 library") find_library(OPENNI2_LIBRARY "OpenNI2" PATHS $ENV{OPENNI2_LIB64} DOC "OpenNI2 library")
endif() endif()
elseif(UNIX OR APPLE) elseif(UNIX OR APPLE)
find_file(OPENNI2_INCLUDES "OpenNI.h" PATHS "/usr/include/ni2" "/usr/include/openni2" DOC "OpenNI2 c++ interface header") 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" DOC "OpenNI2 library") find_library(OPENNI2_LIBRARY "OpenNI2" PATHS "/usr/lib" $ENV{OPENNI2_REDIST} DOC "OpenNI2 library")
endif() endif()
if(OPENNI2_LIBRARY AND OPENNI2_INCLUDES) if(OPENNI2_LIBRARY AND OPENNI2_INCLUDES)

6
modules/videoio/src/cap_openni2.cpp
View File

@ -821,10 +821,10 @@ IplImage* CvCapture_OpenNI2::retrieveValidDepthMask()
if (!depthFrame.isValid()) if (!depthFrame.isValid())
return 0; return 0;
cv::Mat depth; cv::Mat d;
getDepthMapFromMetaData(depthFrame, depth, noSampleValue, shadowValue); 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(); return outputMaps[CV_CAP_OPENNI_VALID_DEPTH_MASK].getIplImagePtr();
} }