Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
be76b451
Commit
be76b451
authored
Oct 11, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12791 from alalek:win32_dllmain_detect_termination
parents
53785b6a
11e2a216
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
1 deletion
+50
-1
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+8
-0
dllmain.cpp.in
cmake/templates/dllmain.cpp.in
+36
-0
ocl.cpp
modules/core/src/ocl.cpp
+4
-0
precomp.hpp
modules/core/src/precomp.hpp
+2
-1
No files found.
cmake/OpenCVModule.cmake
View file @
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
View file @
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
View file @
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
View file @
be76b451
...
...
@@ -308,7 +308,8 @@ TLSData<CoreTLSData>& getCoreTlsData();
#define CL_RUNTIME_EXPORT
#endif
extern
bool
__termination
;
// skip some cleanups, because process is terminating
extern
CV_EXPORTS
bool
__termination
;
// skip some cleanups, because process is terminating
// (for example, if ExitProcess() was already called)
cv
::
Mutex
&
getInitializationMutex
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment