Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
d4df1e0b
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
994
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d4df1e0b
编写于
7月 02, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merged the trunk r8887, r8891, r8314
上级
5a7804d9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
8 deletion
+15
-8
modules/core/src/system.cpp
modules/core/src/system.cpp
+1
-1
modules/features2d/src/draw.cpp
modules/features2d/src/draw.cpp
+2
-2
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/highgui/src/cap_ffmpeg_impl.hpp
+2
-2
modules/ts/misc/run.py
modules/ts/misc/run.py
+10
-3
未找到文件。
modules/core/src/system.cpp
浏览文件 @
d4df1e0b
...
...
@@ -478,7 +478,7 @@ string tempfile( const char* suffix )
char
temp_file
[
MAX_PATH
+
1
]
=
{
0
};
::
GetTempPathA
(
sizeof
(
temp_dir
),
temp_dir
);
if
(
0
==
::
GetTempFileNameA
(
temp_dir
,
"
__opencv_temp.
"
,
0
,
temp_file
))
if
(
0
==
::
GetTempFileNameA
(
temp_dir
,
"
ocv
"
,
0
,
temp_file
))
return
string
();
string
name
=
temp_file
;
...
...
modules/features2d/src/draw.cpp
浏览文件 @
d4df1e0b
...
...
@@ -68,8 +68,8 @@ static inline void _drawKeypoint( Mat& img, const KeyPoint& p, const Scalar& col
if
(
p
.
angle
!=
-
1
)
{
float
srcAngleRad
=
p
.
angle
*
(
float
)
CV_PI
/
180.
f
;
Point
orient
(
cvRound
(
cos
(
srcAngleRad
)
*
radius
),
cvRound
(
-
sin
(
srcAngleRad
)
*
radius
)
// "-" to invert orientation of axis y
Point
orient
(
cvRound
(
cos
(
srcAngleRad
)
*
radius
),
cvRound
(
sin
(
srcAngleRad
)
*
radius
)
);
line
(
img
,
center
,
center
+
orient
,
color
,
1
,
CV_AA
,
draw_shift_bits
);
}
...
...
modules/highgui/src/cap_ffmpeg_impl.hpp
浏览文件 @
d4df1e0b
...
...
@@ -669,7 +669,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
// if we have not grabbed a single frame before first seek, let's read the first frame
// and get some valuable information during the process
if
(
first_frame_number
<
0
)
if
(
first_frame_number
<
0
&&
get_total_frames
()
>
1
)
grabFrame
();
for
(;;)
...
...
@@ -679,7 +679,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
int64_t
time_stamp
=
ic
->
streams
[
video_stream
]
->
start_time
;
double
time_base
=
r2d
(
ic
->
streams
[
video_stream
]
->
time_base
);
time_stamp
+=
(
int64_t
)(
sec
/
time_base
+
0.5
);
av_seek_frame
(
ic
,
video_stream
,
time_stamp
,
AVSEEK_FLAG_BACKWARD
);
if
(
get_total_frames
()
>
1
)
av_seek_frame
(
ic
,
video_stream
,
time_stamp
,
AVSEEK_FLAG_BACKWARD
);
avcodec_flush_buffers
(
ic
->
streams
[
video_stream
]
->
codec
);
if
(
_frame_number
>
0
)
{
...
...
modules/ts/misc/run.py
浏览文件 @
d4df1e0b
...
...
@@ -716,13 +716,20 @@ class RunInfo(object):
# clean temporary files
temp_path
=
os
.
environ
.
get
(
'OPENCV_TEMP_PATH'
)
if
not
temp_path
:
if
hos
tos
==
"nt"
:
if
self
.
targe
tos
==
"nt"
:
temp_path
=
tempfile
.
gettempdir
()
else
:
temp_path
=
"/tmp"
for
filename
in
glob
.
glob
(
os
.
path
.
join
(
temp_path
,
"__opencv_temp.*"
))
:
os
.
remove
(
filename
)
try
:
if
self
.
targetos
==
"nt"
:
for
filename
in
glob
.
glob
(
os
.
path
.
join
(
temp_path
,
"ocv*"
))
:
os
.
remove
(
filename
)
else
:
for
filename
in
glob
.
glob
(
os
.
path
.
join
(
temp_path
,
"__opencv_temp.*"
))
:
os
.
remove
(
filename
)
except
:
pass
logpath
=
os
.
path
.
join
(
workingDir
,
logfile
)
if
os
.
path
.
isfile
(
logpath
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录