generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix windows build warnings

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-22 18:46:26 +04:00
parent 15076f9232
commit 40030d2ca0
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/include/opencv2/core/operations.hpp
View File

@ -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

4
modules/core/src/parallel.cpp
View File

@ -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

2
modules/flann/src/miniflann.cpp
View File

@ -500,7 +500,7 @@ int runRadiusSearch_(void* index, const Mat& query, Mat& indices, Mat& dists,
::cvflann::Matrix<DistanceType> _dists((DistanceType*)dists.data, dists.rows, dists.cols);
return ((IndexType*)index)->radiusSearch(_query, _indices, _dists,
saturate_cast<DistanceType>(radius),
saturate_cast<float>(radius),
(const ::cvflann::SearchParams&)get_params(params));
}

12
modules/imgproc/src/color.cpp
View File

@ -1387,8 +1387,8 @@ struct RGB2Lab_f
C6 = coeffs[6], C7 = coeffs[7], C8 = coeffs[8];
n *= 3;
static const float _1_3 = 1.0 / 3.0;
static const double _a = 16.0 / 116;
static const float _1_3 = 1.0f / 3.0f;
static const float _a = 16.0f / 116.0f;
for (i = 0; i < n; i += 3, src += scn )
{
float R = clip(src[0]);
@ -1409,11 +1409,11 @@ struct RGB2Lab_f
float Y = R*C3 + G*C4 + B*C5;
float Z = R*C6 + G*C7 + B*C8;
float FX = X > 0.008856 ? pow(X, _1_3) : (7.787f * X + _a);
float FY = Y > 0.008856 ? pow(Y, _1_3) : (7.787f * Y + _a);
float FZ = Z > 0.008856 ? pow(Z, _1_3) : (7.787f * Z + _a);
float FX = X > 0.008856f ? pow(X, _1_3) : (7.787f * X + _a);
float FY = Y > 0.008856f ? pow(Y, _1_3) : (7.787f * Y + _a);
float FZ = Z > 0.008856f ? pow(Z, _1_3) : (7.787f * Z + _a);
float L = Y > 0.008856 ? (116.f * FY - 16.f) : (903.3 * Y);
float L = Y > 0.008856f ? (116.f * FY - 16.f) : (903.3f * Y);
float a = 500.f * (FX - FY);
float b = 200.f * (FY - FZ);