Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c5e979ce
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,发现更多精彩内容 >>
提交
c5e979ce
编写于
2月 28, 2013
作者:
A
Andrey Kamaev
提交者:
OpenCV Buildbot
2月 28, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #581 from vpisarev:ios_fix
上级
c6318ffa
11ba220e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
8 deletion
+8
-8
modules/highgui/src/cap_avfoundation.mm
modules/highgui/src/cap_avfoundation.mm
+7
-7
modules/softcascade/src/_random.hpp
modules/softcascade/src/_random.hpp
+1
-1
未找到文件。
modules/highgui/src/cap_avfoundation.mm
浏览文件 @
c5e979ce
...
...
@@ -243,7 +243,7 @@ CvCaptureCAM::CvCaptureCAM(int cameraNum) {
camNum
=
cameraNum
;
if
(
!
startCaptureDevice
(
camNum
))
{
cout
<<
"Warning, camera failed to properly initialize!"
<<
endl
;
std
::
cout
<<
"Warning, camera failed to properly initialize!"
<<
std
::
endl
;
started
=
0
;
}
else
{
started
=
1
;
...
...
@@ -288,7 +288,7 @@ IplImage* CvCaptureCAM::retrieveFrame(int) {
IplImage
*
CvCaptureCAM
::
queryFrame
()
{
while
(
!
grabFrame
())
{
cout
<<
"WARNING: Couldn't grab new frame from camera!!!"
<<
endl
;
std
::
cout
<<
"WARNING: Couldn't grab new frame from camera!!!"
<<
std
::
endl
;
/*
cout << "Attempting to restart camera; set capture property DISABLE_AUTO_RESTART to disable." << endl;
stopCaptureDevice();
...
...
@@ -320,7 +320,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
AVCaptureDevice
*
device
;
NSArray
*
devices
=
[
AVCaptureDevice
devicesWithMediaType
:
AVMediaTypeVideo
];
if
([
devices
count
]
==
0
)
{
cout
<<
"AV Foundation didn't find any attached Video Input Devices!"
<<
endl
;
std
::
cout
<<
"AV Foundation didn't find any attached Video Input Devices!"
<<
std
::
endl
;
[
localpool
drain
];
return
0
;
}
...
...
@@ -328,7 +328,7 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
if
(
cameraNum
>=
0
)
{
camNum
=
cameraNum
%
[
devices
count
];
if
(
camNum
!=
cameraNum
)
{
cout
<<
"Warning: Max Camera Num is "
<<
[
devices
count
]
-
1
<<
"; Using camera "
<<
camNum
<<
endl
;
std
::
cout
<<
"Warning: Max Camera Num is "
<<
[
devices
count
]
-
1
<<
"; Using camera "
<<
camNum
<<
std
::
endl
;
}
device
=
[
devices
objectAtIndex
:
camNum
];
}
else
{
...
...
@@ -1166,8 +1166,8 @@ CvVideoWriter_AVFoundation::CvVideoWriter_AVFoundation(const char* filename, int
cc
[
4
]
=
0
;
int
cc2
=
CV_FOURCC
(
cc
[
0
],
cc
[
1
],
cc
[
2
],
cc
[
3
]);
if
(
cc2
!=
fourcc
)
{
cout
<<
"WARNING: Didn't properly encode FourCC. Expected "
<<
fourcc
<<
" but got "
<<
cc2
<<
"."
<<
endl
;
std
::
cout
<<
"WARNING: Didn't properly encode FourCC. Expected "
<<
fourcc
<<
" but got "
<<
cc2
<<
"."
<<
std
::
endl
;
//exception;
}
...
...
@@ -1269,7 +1269,7 @@ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) {
BOOL
success
=
FALSE
;
if
(
iplimage
->
height
!=
movieSize
.
height
||
iplimage
->
width
!=
movieSize
.
width
){
cout
<<
"Frame size does not match video size."
<<
endl
;
std
::
cout
<<
"Frame size does not match video size."
<<
std
::
endl
;
[
localpool
drain
];
return
false
;
}
...
...
modules/softcascade/src/_random.hpp
浏览文件 @
c5e979ce
...
...
@@ -58,7 +58,7 @@ struct Random
}}}
#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__)
#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__)
&& !defined(__APPLE__)
# if defined (__cplusplus) && __cplusplus > 201100L
# include <random>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录