Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2e7656db
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
2e7656db
编写于
10月 12, 2012
作者:
E
Evgeny Talanin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#2192 patch apply
上级
83799d6b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
52 addition
and
1 deletion
+52
-1
CMakeLists.txt
CMakeLists.txt
+5
-0
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVFindLibsVideo.cmake
+13
-0
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+8
-0
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/include/opencv2/highgui/highgui_c.h
+12
-1
modules/highgui/src/cap.cpp
modules/highgui/src/cap.cpp
+12
-0
modules/highgui/src/precomp.hpp
modules/highgui/src/precomp.hpp
+1
-0
modules/highgui/test/test_precomp.hpp
modules/highgui/test/test_precomp.hpp
+1
-0
未找到文件。
CMakeLists.txt
浏览文件 @
2e7656db
...
...
@@ -129,6 +129,7 @@ OCV_OPTION(WITH_OPENGL "Include OpenGL support" OFF
OCV_OPTION
(
WITH_OPENNI
"Include OpenNI support"
OFF
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_PNG
"Include PNG support"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
WITH_PVAPI
"Include Prosilica GigE support"
ON
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_GIGEAPI
"Include Smartek GigE support"
ON
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_QT
"Build with Qt Backend support"
OFF
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_QUICKTIME
"Use QuickTime for Video I/O insted of QTKit"
OFF IF APPLE
)
OCV_OPTION
(
WITH_TBB
"Include Intel TBB support"
OFF
IF
(
NOT IOS
)
)
...
...
@@ -693,6 +694,10 @@ if(DEFINED WITH_PVAPI)
status
(
" PvAPI:"
HAVE_PVAPI THEN YES ELSE NO
)
endif
(
DEFINED WITH_PVAPI
)
if
(
DEFINED WITH_GIGEAPI
)
status
(
" GigEVisionSDK:"
HAVE_GIGE_API THEN YES ELSE NO
)
endif
(
DEFINED WITH_GIGEAPI
)
if
(
DEFINED WITH_QUICKTIME
)
status
(
" QuickTime:"
WITH_QUICKTIME THEN YES ELSE NO
)
status
(
" QTKit:"
WITH_QUICKTIME THEN NO ELSE YES
)
...
...
cmake/OpenCVFindLibsVideo.cmake
浏览文件 @
2e7656db
...
...
@@ -56,6 +56,19 @@ if(WITH_PVAPI)
endif
(
PVAPI_INCLUDE_PATH
)
endif
(
WITH_PVAPI
)
# --- GigEVisionSDK ---
ocv_clear_vars
(
HAVE_GIGE_API
)
if
(
WITH_GIGEAPI
)
find_path
(
GIGEAPI_INCLUDE_PATH
"GigEVisionSDK.h"
PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
PATH_SUFFIXES include
"Smartek Vision Technologies/GigEVisionSDK/gige_cpp"
"GigEVisionSDK/gige_cpp"
"GigEVisionSDK/gige_c"
DOC
"The path to Smartek GigEVisionSDK header"
)
FIND_LIBRARY
(
GIGEAPI_LIBRARIES NAMES GigEVisionSDK
)
if
(
GIGEAPI_LIBRARIES AND GIGEAPI_INCLUDE_PATH
)
set
(
HAVE_GIGE_API TRUE
)
endif
()
endif
(
WITH_GIGEAPI
)
# --- Dc1394 ---
ocv_clear_vars
(
HAVE_DC1394 HAVE_DC1394_2
)
if
(
WITH_1394
)
...
...
modules/highgui/CMakeLists.txt
浏览文件 @
2e7656db
...
...
@@ -171,6 +171,14 @@ if(HAVE_PVAPI)
list
(
APPEND HIGHGUI_LIBRARIES
${
PVAPI_LIBRARY
}
)
endif
()
if
(
HAVE_GIGE_API
)
add_definitions
(
-DHAVE_GIGE_API
)
ocv_include_directories
(
${
GIGEAPI_INCLUDE_PATH
}
)
set
(
highgui_srcs src/cap_giganetix.cpp
${
highgui_srcs
}
)
list
(
APPEND HIGHGUI_LIBRARIES
${
GIGEAPI_LIBRARIES
}
)
list
(
APPEND highgui_srcs src/cap_giganetix.cpp
)
endif
(
HAVE_GIGE_API
)
if
(
WITH_IMAGEIO
)
add_definitions
(
-DHAVE_IMAGEIO=1
)
if
(
IOS
)
...
...
modules/highgui/include/opencv2/highgui/highgui_c.h
浏览文件 @
2e7656db
...
...
@@ -307,7 +307,9 @@ enum
CV_CAP_XIAPI
=
1100
,
// XIMEA Camera API
CV_CAP_AVFOUNDATION
=
1200
// AVFoundation framework for iOS (OS X Lion will have the same API)
CV_CAP_AVFOUNDATION
=
1200
,
// AVFoundation framework for iOS (OS X Lion will have the same API)
CV_CAP_GIGANETIX
=
1300
// Smartek Giganetix GigEVisionSDK
};
/* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */
...
...
@@ -454,6 +456,15 @@ enum
CV_CAP_PROP_IOS_DEVICE_FLASH
=
9003
,
CV_CAP_PROP_IOS_DEVICE_WHITEBALANCE
=
9004
,
CV_CAP_PROP_IOS_DEVICE_TORCH
=
9005
// Properties of cameras available through Smartek Giganetix Ethernet Vision interface
/* --- Vladimir Litvinenko (litvinenko.vladimir@gmail.com) --- */
,
CV_CAP_PROP_GIGA_FRAME_OFFSET_X
=
10001
,
CV_CAP_PROP_GIGA_FRAME_OFFSET_Y
=
10002
,
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
};
enum
...
...
modules/highgui/src/cap.cpp
浏览文件 @
2e7656db
...
...
@@ -149,6 +149,9 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
#endif
#ifdef HAVE_AVFOUNDATION
CV_CAP_AVFOUNDATION
,
#endif
#ifdef HAVE_GIGE_API
CV_CAP_GIGANETIX
,
#endif
-
1
};
...
...
@@ -182,6 +185,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
defined(HAVE_XIMEA) || \
defined(HAVE_AVFOUNDATION) || \
defined(HAVE_ANDROID_NATIVE_CAMERA) || \
defined(HAVE_GIGE_API) || \
(0)
// local variable to memorize the captured device
CvCapture
*
capture
;
...
...
@@ -318,6 +322,14 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
return
capture
;
break
;
#endif
#ifdef HAVE_GIGE_API
case
CV_CAP_GIGANETIX
:
capture
=
cvCreateCameraCapture_Giganetix
(
index
);
if
(
capture
)
return
capture
;
break
;
// CV_CAP_GIGANETIX
#endif
}
}
...
...
modules/highgui/src/precomp.hpp
浏览文件 @
2e7656db
...
...
@@ -112,6 +112,7 @@ CvCapture * cvCreateCameraCapture_V4L( int index );
CvCapture
*
cvCreateCameraCapture_DC1394
(
int
index
);
CvCapture
*
cvCreateCameraCapture_DC1394_2
(
int
index
);
CvCapture
*
cvCreateCameraCapture_MIL
(
int
index
);
CvCapture
*
cvCreateCameraCapture_Giganetix
(
int
index
);
CvCapture
*
cvCreateCameraCapture_CMU
(
int
index
);
CV_IMPL
CvCapture
*
cvCreateCameraCapture_TYZX
(
int
index
);
CvCapture
*
cvCreateFileCapture_Win32
(
const
char
*
filename
);
...
...
modules/highgui/test/test_precomp.hpp
浏览文件 @
2e7656db
...
...
@@ -31,6 +31,7 @@
defined(HAVE_OPENNI) || \
defined(HAVE_XIMEA) || \
defined(HAVE_AVFOUNDATION) || \
defined(HAVE_GIGE_API) || \
(0)
//defined(HAVE_ANDROID_NATIVE_CAMERA) || - enable after #1193
# define BUILD_WITH_CAMERA_SUPPORT 1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录