mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
Fix windows build warnings
This commit is contained in:
@@ -86,6 +86,11 @@
|
||||
|
||||
#include <limits>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:4127) //conditional expression is constant
|
||||
#endif
|
||||
|
||||
namespace cv
|
||||
{
|
||||
|
||||
@@ -3950,5 +3955,9 @@ template<typename _Tp> inline void AlgorithmInfo::addParam(Algorithm& algo, cons
|
||||
|
||||
}
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif // __cplusplus
|
||||
#endif
|
||||
|
||||
@@ -362,8 +362,8 @@ void cv::setNumThreads( int threads )
|
||||
else if (pplScheduler == 0 || 1 + pplScheduler->GetNumberOfVirtualProcessors() != (unsigned int)threads)
|
||||
{
|
||||
pplScheduler = Concurrency::Scheduler::Create(Concurrency::SchedulerPolicy(2,
|
||||
Concurrency::PolicyElementKey::MinConcurrency, threads-1,
|
||||
Concurrency::PolicyElementKey::MaxConcurrency, threads-1));
|
||||
Concurrency::MinConcurrency, threads-1,
|
||||
Concurrency::MaxConcurrency, threads-1));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user