Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
be76b451
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,发现更多精彩内容 >>
提交
be76b451
编写于
10月 11, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12791 from alalek:win32_dllmain_detect_termination
上级
53785b6a
11e2a216
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
51 addition
and
2 deletion
+51
-2
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+8
-0
cmake/templates/dllmain.cpp.in
cmake/templates/dllmain.cpp.in
+36
-0
modules/core/src/ocl.cpp
modules/core/src/ocl.cpp
+4
-0
modules/core/src/precomp.hpp
modules/core/src/precomp.hpp
+3
-2
未找到文件。
cmake/OpenCVModule.cmake
浏览文件 @
be76b451
...
...
@@ -909,6 +909,13 @@ macro(_ocv_create_module)
source_group
(
"Src"
FILES
"
${
_VS_VERSION_FILE
}
"
)
endif
()
endif
()
if
(
WIN32 AND
NOT
(
"
${
the_module
}
"
STREQUAL
"opencv_core"
OR
"
${
the_module
}
"
STREQUAL
"opencv_world"
)
AND
(
BUILD_SHARED_LIBS AND NOT
"x
${
OPENCV_MODULE_TYPE
}
"
STREQUAL
"xSTATIC"
)
AND NOT OPENCV_SKIP_DLLMAIN_GENERATION
)
set
(
_DLLMAIN_FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
the_module
}
_main.cpp"
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/dllmain.cpp.in"
"
${
_DLLMAIN_FILE
}
"
@ONLY
)
endif
()
source_group
(
"Include"
FILES
"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/cvconfig.h"
"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/opencv2/opencv_modules.hpp"
)
source_group
(
"Src"
FILES
"
${${
the_module
}
_pch
}
"
)
...
...
@@ -918,6 +925,7 @@ macro(_ocv_create_module)
"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/cvconfig.h"
"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
/opencv2/opencv_modules.hpp"
${${
the_module
}
_pch
}
${
_VS_VERSION_FILE
}
${
_DLLMAIN_FILE
}
)
set_target_properties
(
${
the_module
}
PROPERTIES LABELS
"
${
OPENCV_MODULE_
${
the_module
}
_LABEL
}
;Module"
)
set_source_files_properties
(
${
OPENCV_MODULE_
${
the_module
}
_HEADERS
}
${
OPENCV_MODULE_
${
the_module
}
_SOURCES
}
${${
the_module
}
_pch
}
...
...
cmake/templates/dllmain.cpp.in
0 → 100644
浏览文件 @
be76b451
// This file is part of OpenCV project.
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
#ifndef _WIN32
#error "Build configuration error"
#endif
#ifndef CVAPI_EXPORTS
#error "Build configuration error"
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define OPENCV_MODULE_S "@the_module@"
namespace cv {
extern __declspec(dllimport) bool __termination; // Details: #12750
}
extern "C"
BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved);
extern "C"
BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved)
{
if (fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH)
{
if (lpReserved != NULL) // called after ExitProcess() call
{
//printf("OpenCV: terminating: " OPENCV_MODULE_S "\n");
cv::__termination = true;
}
}
return TRUE;
}
modules/core/src/ocl.cpp
浏览文件 @
be76b451
...
...
@@ -4779,6 +4779,10 @@ public:
void
deallocate_
(
UMatData
*
u
)
const
{
#ifdef _WIN32
if
(
cv
::
__termination
)
// process is not in consistent state (after ExitProcess call) and terminating
return
;
// avoid any OpenCL calls
#endif
if
(
u
->
tempUMat
())
{
CV_Assert
(
u
->
origdata
);
...
...
modules/core/src/precomp.hpp
浏览文件 @
be76b451
...
...
@@ -308,8 +308,9 @@ TLSData<CoreTLSData>& getCoreTlsData();
#define CL_RUNTIME_EXPORT
#endif
extern
bool
__termination
;
// skip some cleanups, because process is terminating
// (for example, if ExitProcess() was already called)
extern
CV_EXPORTS
bool
__termination
;
// skip some cleanups, because process is terminating
// (for example, if ExitProcess() was already called)
cv
::
Mutex
&
getInitializationMutex
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录