Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
1242a661
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1242a661
编写于
7月 20, 2014
作者:
L
Lars Glud
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Openni2 support
上级
4dcd37f6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
18 addition
and
20 deletion
+18
-20
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+0
-6
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui.hpp
+0
-5
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/include/opencv2/highgui/highgui_c.h
+0
-4
modules/videoio/CMakeLists.txt
modules/videoio/CMakeLists.txt
+6
-0
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/include/opencv2/videoio.hpp
+5
-2
modules/videoio/include/opencv2/videoio/videoio_c.h
modules/videoio/include/opencv2/videoio/videoio_c.h
+5
-1
modules/videoio/src/cap_openni2.cpp
modules/videoio/src/cap_openni2.cpp
+2
-2
未找到文件。
modules/highgui/CMakeLists.txt
浏览文件 @
1242a661
...
...
@@ -72,12 +72,6 @@ elseif(HAVE_COCOA)
list
(
APPEND HIGHGUI_LIBRARIES
"-framework Cocoa"
)
endif
()
if
(
HAVE_OPENNI2
)
list
(
APPEND highgui_srcs src/cap_openni2.cpp
)
ocv_include_directories
(
${
OPENNI2_INCLUDE_DIR
}
)
list
(
APPEND HIGHGUI_LIBRARIES
${
OPENNI2_LIBRARY
}
)
endif
(
HAVE_OPENNI2
)
if
(
UNIX
)
#these variables are set by CHECK_MODULE macro
foreach
(
P
${
HIGHGUI_INCLUDE_DIRS
}
)
...
...
modules/highgui/include/opencv2/highgui.hpp
浏览文件 @
1242a661
...
...
@@ -201,9 +201,4 @@ CV_EXPORTS int createButton( const String& bar_name, ButtonCallback on_change,
bool
initial_button_state
=
false
);
}
// cv
CAP_OPENNI2
=
1600
// OpenNI2 (for Kinect)
CAP_PROP_OPENNI_OUTPUT_MODE
=
100
,
CAP_PROP_OPENNI2_SYNC
=
110
,
CAP_PROP_OPENNI2_MIRROR
=
111
#endif
modules/highgui/include/opencv2/highgui/highgui_c.h
浏览文件 @
1242a661
...
...
@@ -208,10 +208,6 @@ CVAPI(void) cvUpdateWindow(const char* window_name);
/****************************************************************************************\
CV_CAP_OPENNI2 = 1600 // OpenNI2 (for Kinect)
CV_CAP_PROP_OPENNI2_SYNC = 110,
CV_CAP_PROP_OPENNI2_MIRROR = 111,
* Obsolete functions/synonyms *
\****************************************************************************************/
...
...
modules/videoio/CMakeLists.txt
浏览文件 @
1242a661
...
...
@@ -78,6 +78,12 @@ if(HAVE_OPENNI)
list
(
APPEND VIDEOIO_LIBRARIES
${
OPENNI_LIBRARY
}
)
endif
(
HAVE_OPENNI
)
if
(
HAVE_OPENNI2
)
list
(
APPEND videoio_srcs src/cap_openni2.cpp
)
ocv_include_directories
(
${
OPENNI2_INCLUDE_DIR
}
)
list
(
APPEND VIDEOIO_LIBRARIES
${
OPENNI2_LIBRARY
}
)
endif
(
HAVE_OPENNI2
)
if
(
HAVE_opencv_androidcamera
)
list
(
APPEND videoio_srcs src/cap_android.cpp
)
add_definitions
(
-DHAVE_ANDROID_NATIVE_CAMERA
)
#TODO: remove this line
...
...
modules/videoio/include/opencv2/videoio.hpp
浏览文件 @
1242a661
...
...
@@ -75,7 +75,8 @@ enum { CAP_ANY = 0, // autodetect
CAP_AVFOUNDATION
=
1200
,
// AVFoundation framework for iOS (OS X Lion will have the same API)
CAP_GIGANETIX
=
1300
,
// Smartek Giganetix GigEVisionSDK
CAP_MSMF
=
1400
,
// Microsoft Media Foundation (via videoInput)
CAP_INTELPERC
=
1500
// Intel Perceptual Computing SDK
CAP_INTELPERC
=
1500
,
// Intel Perceptual Computing SDK
CAP_OPENNI2
=
1600
// OpenNI2 (for Kinect)
};
// generic properties (based on DC1394 properties)
...
...
@@ -149,7 +150,9 @@ enum { CAP_PROP_OPENNI_OUTPUT_MODE = 100,
CAP_PROP_OPENNI_MAX_BUFFER_SIZE
=
106
,
CAP_PROP_OPENNI_CIRCLE_BUFFER
=
107
,
CAP_PROP_OPENNI_MAX_TIME_DURATION
=
108
,
CAP_PROP_OPENNI_GENERATOR_PRESENT
=
109
CAP_PROP_OPENNI_GENERATOR_PRESENT
=
109
,
CAP_PROP_OPENNI2_SYNC
=
110
,
CAP_PROP_OPENNI2_MIRROR
=
111
};
// OpenNI shortcats
...
...
modules/videoio/include/opencv2/videoio/videoio_c.h
浏览文件 @
1242a661
...
...
@@ -104,7 +104,9 @@ enum
CV_CAP_GIGANETIX
=
1300
,
// Smartek Giganetix GigEVisionSDK
CV_CAP_INTELPERC
=
1500
// Intel Perceptual Computing SDK
CV_CAP_INTELPERC
=
1500
,
// Intel Perceptual Computing
CV_CAP_OPENNI2
=
1600
// OpenNI2 (for Kinect)
};
/* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */
...
...
@@ -200,6 +202,8 @@ enum
CV_CAP_PROP_OPENNI_MAX_TIME_DURATION
=
108
,
CV_CAP_PROP_OPENNI_GENERATOR_PRESENT
=
109
,
CV_CAP_PROP_OPENNI2_SYNC
=
110
,
CV_CAP_PROP_OPENNI2_MIRROR
=
111
,
CV_CAP_OPENNI_IMAGE_GENERATOR_PRESENT
=
CV_CAP_OPENNI_IMAGE_GENERATOR
+
CV_CAP_PROP_OPENNI_GENERATOR_PRESENT
,
CV_CAP_OPENNI_IMAGE_GENERATOR_OUTPUT_MODE
=
CV_CAP_OPENNI_IMAGE_GENERATOR
+
CV_CAP_PROP_OPENNI_OUTPUT_MODE
,
...
...
modules/
highgui
/src/cap_openni2.cpp
→
modules/
videoio
/src/cap_openni2.cpp
浏览文件 @
1242a661
...
...
@@ -481,7 +481,7 @@ bool CvCapture_OpenNI2::setCommonProperty( int propIdx, double propValue )
{
case
CV_CAP_PROP_OPENNI2_MIRROR
:
{
bool
mirror
=
propValue
>
0
?
true
:
false
;
bool
mirror
=
propValue
>
0
.0
?
true
:
false
;
isSet
=
color
.
setMirroringEnabled
(
mirror
)
==
openni
::
STATUS_OK
;
isSet
=
depth
.
setMirroringEnabled
(
mirror
)
==
openni
::
STATUS_OK
;
}
...
...
@@ -492,7 +492,7 @@ bool CvCapture_OpenNI2::setCommonProperty( int propIdx, double propValue )
isSet
=
setDepthGeneratorProperty
(
propIdx
,
propValue
);
break
;
case
CV_CAP_PROP_OPENNI2_SYNC
:
isSet
=
device
.
setDepthColorSyncEnabled
(
propValue
)
==
openni
::
STATUS_OK
;
isSet
=
device
.
setDepthColorSyncEnabled
(
propValue
>
0.0
)
==
openni
::
STATUS_OK
;
break
;
default:
CV_Error
(
CV_StsBadArg
,
cv
::
format
(
"Such parameter (propIdx=%d) isn't supported for setting.
\n
"
,
propIdx
)
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录