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

Merge pull request #3512 from vins31:OpenNi2_AsusXtion

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-22 10:39:42 +00:00
parent 700a388173 4d12beb723
commit 432546e4c4
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/videoio/include/opencv2/videoio.hpp
View File

@@ -86,7 +86,8 @@ enum { CAP_ANY = 0, // autodetect
CAP_GIGANETIX = 1300, // Smartek Giganetix GigEVisionSDK
CAP_MSMF = 1400, // Microsoft Media Foundation (via videoInput)
CAP_INTELPERC = 1500, // Intel Perceptual Computing SDK
CAP_OPENNI2 = 1600 // OpenNI2 (for Kinect)
CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect)
CAP_OPENNI2_ASUS = 1610 // OpenNI2 (for Asus Xtion and Occipital Structure sensors)
};
// generic properties (based on DC1394 properties)