Skip to content

Commit 9d89edf

Browse files
committed
Merge pull request opencv#19594 from alalek:hotfix_19470
2 parents 0a6f216 + 599d64a commit 9d89edf

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

modules/core/include/opencv2/core/parallel/parallel_backend.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifndef OPENCV_CORE_PARALLEL_BACKEND_HPP
66
#define OPENCV_CORE_PARALLEL_BACKEND_HPP
77

8+
#include "opencv2/core/cvdef.h"
89
#include <memory>
910

1011
namespace cv { namespace parallel {

modules/core/misc/plugins/parallel_openmp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake")
88
set(WITH_OPENMP ON)
99
include("${OpenCV_SOURCE_DIR}/modules/core/cmake/parallel/init.cmake")
1010

11-
message(STATUS "OpenMP: ${OPENMP_VERSION}")
11+
message(STATUS "OpenMP: ${OpenMP_CXX_VERSION}")
1212
ocv_create_plugin(core "opencv_core_parallel_openmp" "ocv.3rdparty.openmp" "OPENMP" "src/parallel/parallel_openmp.cpp")

modules/core/src/parallel/plugin_parallel_wrapper.impl.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ std::shared_ptr<IParallelBackendFactory> createPluginParallelBackendFactory(cons
279279
#if OPENCV_HAVE_FILESYSTEM_SUPPORT && defined(PARALLEL_ENABLE_PLUGINS)
280280
return std::make_shared<impl::PluginParallelBackendFactory>(baseName);
281281
#else
282+
CV_UNUSED(baseName);
282283
return std::shared_ptr<IParallelBackendFactory>();
283284
#endif
284285
}

0 commit comments

Comments
 (0)