Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
81325a3f
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,发现更多精彩内容 >>
提交
81325a3f
编写于
7月 06, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
上级
aa0c6ddb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
38 deletion
+34
-38
modules/highgui/src/window_gtk.cpp
modules/highgui/src/window_gtk.cpp
+34
-38
未找到文件。
modules/highgui/src/window_gtk.cpp
浏览文件 @
81325a3f
...
...
@@ -597,10 +597,15 @@ int thread_started=0;
static
gpointer
icvWindowThreadLoop
(
gpointer
data
);
GMutex
*
last_key_mutex
=
NULL
;
GCond
*
cond_have_key
=
NULL
;
GMutex
*
window_mutex
=
NULL
;
GThread
*
window_thread
=
NULL
;
#endif
static
cv
::
Mutex
&
getWindowMutex
()
{
static
cv
::
Mutex
*
g_window_mutex
=
new
cv
::
Mutex
();
return
*
g_window_mutex
;
}
static
int
last_key
=
-
1
;
static
std
::
vector
<
Ptr
<
CvWindow
>
>
g_windows
;
...
...
@@ -627,28 +632,28 @@ CV_IMPL int cvInitSystem( int argc, char** argv )
CV_IMPL
int
cvStartWindowThread
(){
#ifdef HAVE_GTHREAD
cvInitSystem
(
0
,
NULL
);
if
(
!
thread_started
)
{
if
(
!
g_thread_supported
())
{
/* the GThread system wasn't inited, so init it */
g_thread_init
(
NULL
);
}
// this mutex protects the window resources
window_mutex
=
g_mutex_new
();
// protects the 'last key pressed' variable
last_key_mutex
=
g_mutex_new
();
// conditional that indicates a key has been pressed
cond_have_key
=
g_cond_new
();
#if !GLIB_CHECK_VERSION(2, 32, 0)
// this is the window update thread
window_thread
=
g_thread_create
(
icvWindowThreadLoop
,
NULL
,
TRUE
,
NULL
);
#else
window_thread
=
g_thread_new
(
"OpenCV window update"
,
icvWindowThreadLoop
,
NULL
);
#endif
if
(
!
thread_started
)
{
if
(
!
g_thread_supported
())
{
/* the GThread system wasn't inited, so init it */
g_thread_init
(
NULL
);
}
(
void
)
getWindowMutex
();
// force mutex initialization
// protects the 'last key pressed' variable
last_key_mutex
=
g_mutex_new
();
// conditional that indicates a key has been pressed
cond_have_key
=
g_cond_new
();
#if !GLIB_CHECK_VERSION(2, 32, 0)
// this is the window update thread
window_thread
=
g_thread_create
(
icvWindowThreadLoop
,
NULL
,
TRUE
,
NULL
);
#else
window_thread
=
g_thread_new
(
"OpenCV window update"
,
icvWindowThreadLoop
,
NULL
);
#endif
}
thread_started
=
window_thread
!=
NULL
;
return
thread_started
;
...
...
@@ -661,9 +666,10 @@ CV_IMPL int cvStartWindowThread(){
gpointer
icvWindowThreadLoop
(
gpointer
/*data*/
)
{
while
(
1
){
g_mutex_lock
(
window_mutex
);
gtk_main_iteration_do
(
FALSE
);
g_mutex_unlock
(
window_mutex
);
{
cv
::
AutoLock
lock
(
getWindowMutex
());
gtk_main_iteration_do
(
FALSE
);
}
// little sleep
g_usleep
(
500
);
...
...
@@ -673,20 +679,10 @@ gpointer icvWindowThreadLoop(gpointer /*data*/)
return
NULL
;
}
class
GMutexLock
{
GMutex
*
mutex_
;
public:
GMutexLock
(
GMutex
*
mutex
)
:
mutex_
(
mutex
)
{
if
(
mutex_
)
g_mutex_lock
(
mutex_
);
}
~
GMutexLock
()
{
if
(
mutex_
)
g_mutex_unlock
(
mutex_
);
mutex_
=
NULL
;
}
};
#define CV_LOCK_MUTEX() GMutexLock lock(window_mutex);
#else
#define CV_LOCK_MUTEX()
#endif
#define CV_LOCK_MUTEX() cv::AutoLock lock(getWindowMutex())
static
CvWindow
*
icvFindWindowByName
(
const
char
*
name
)
{
for
(
size_t
i
=
0
;
i
<
g_windows
.
size
();
++
i
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录