Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings.
This commit is contained in:
parent
c16a1d86cc
commit
7cc7a3f37d
4
3rdparty/libjasper/CMakeLists.txt
vendored
4
3rdparty/libjasper/CMakeLists.txt
vendored
@ -22,8 +22,10 @@ file(GLOB lib_ext_hdrs jasper/*.h)
|
|||||||
add_library(${JASPER_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
|
add_library(${JASPER_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
if(NOT ENABLE_NOISY_WARNINGS)
|
||||||
string(REPLACE "/W3" "/W0" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
string(REPLACE "/W3" "/W0" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
||||||
string(REPLACE "/W4" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "/W4" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
endif()
|
||||||
add_definitions(-DJAS_WIN_MSVC_BUILD)
|
add_definitions(-DJAS_WIN_MSVC_BUILD)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -33,7 +35,7 @@ if(UNIX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-function-declaration -Wno-unused")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-function-declaration -Wno-unused")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
5
3rdparty/libtiff/CMakeLists.txt
vendored
5
3rdparty/libtiff/CMakeLists.txt
vendored
@ -82,8 +82,7 @@ set(lib_srcs
|
|||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
list(APPEND lib_srcs tif_unix.c)
|
list(APPEND lib_srcs tif_unix.c)
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-aliasing -Wno-int-to-pointer-cast")
|
|
||||||
set_source_files_properties(tif_unix.c PROPERTIES COMPILE_FLAGS "-w")
|
set_source_files_properties(tif_unix.c PROPERTIES COMPILE_FLAGS "-w")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
@ -92,7 +91,7 @@ if(WIN32)
|
|||||||
list(APPEND lib_srcs tif_win32.c)
|
list(APPEND lib_srcs tif_win32.c)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
string(REPLACE "/W4" "/W0" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
string(REPLACE "/W4" "/W0" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
||||||
string(REPLACE "/W4" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "/W4" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
endif()
|
endif()
|
||||||
|
2
3rdparty/zlib/CMakeLists.txt
vendored
2
3rdparty/zlib/CMakeLists.txt
vendored
@ -82,7 +82,7 @@ if(UNIX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4013")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4013")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -166,6 +166,7 @@ OCV_OPTION(ENABLE_SSE3 "Enable SSE3 instructions"
|
|||||||
OCV_OPTION(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
OCV_OPTION(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
||||||
OCV_OPTION(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF IF (CV_ICC OR CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
OCV_OPTION(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF IF (CV_ICC OR CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
||||||
OCV_OPTION(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
OCV_OPTION(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
|
||||||
|
OCV_OPTION(ENABLE_NOISY_WARNINGS "Show all warnings even if they are too noisy" OFF )
|
||||||
OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF )
|
OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF )
|
||||||
|
|
||||||
# uncategorized options
|
# uncategorized options
|
||||||
@ -841,7 +842,7 @@ status(" Python:")
|
|||||||
status(" Interpreter:" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_FULL})" ELSE NO)
|
status(" Interpreter:" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_FULL})" ELSE NO)
|
||||||
status(" Libraries:" HAVE_opencv_python THEN ${PYTHON_LIBRARIES} ELSE NO)
|
status(" Libraries:" HAVE_opencv_python THEN ${PYTHON_LIBRARIES} ELSE NO)
|
||||||
status(" numpy:" PYTHON_USE_NUMPY THEN "${PYTHON_NUMPY_INCLUDE_DIR} (ver ${PYTHON_NUMPY_VERSION})" ELSE "NO (Python wrappers can not be generated)")
|
status(" numpy:" PYTHON_USE_NUMPY THEN "${PYTHON_NUMPY_INCLUDE_DIR} (ver ${PYTHON_NUMPY_VERSION})" ELSE "NO (Python wrappers can not be generated)")
|
||||||
status(" packages path:" PYTHON_EXECUTABLE THEN "${PYTHON_PACKAGES_PATH}" ELSE -)
|
status(" packages path:" PYTHON_EXECUTABLE THEN "${PYTHON_PACKAGES_PATH}" ELSE "-")
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
status("")
|
status("")
|
||||||
|
@ -11,13 +11,10 @@ set(OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG "")
|
|||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
|
set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
|
||||||
# 64-bit portability warnings, in MSVC8
|
# 64-bit portability warnings, in MSVC80
|
||||||
if(MSVC80)
|
if(MSVC80)
|
||||||
set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /Wp64")
|
set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /Wp64")
|
||||||
endif()
|
endif()
|
||||||
#if(MSVC90)
|
|
||||||
# set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /D _BIND_TO_CURRENT_CRT_VERSION=1 /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
|
|
||||||
#endif()
|
|
||||||
|
|
||||||
if(BUILD_WITH_DEBUG_INFO)
|
if(BUILD_WITH_DEBUG_INFO)
|
||||||
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
|
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
|
||||||
@ -137,7 +134,7 @@ if(MSVC)
|
|||||||
if(ENABLE_SSE4_1)
|
if(ENABLE_SSE4_1)
|
||||||
set(OPENCV_EXTRA_C_FLAGS_RELEASE "${OPENCV_EXTRA_C_FLAGS_RELEASE} /arch:SSE4.1")
|
set(OPENCV_EXTRA_C_FLAGS_RELEASE "${OPENCV_EXTRA_C_FLAGS_RELEASE} /arch:SSE4.1")
|
||||||
endif()
|
endif()
|
||||||
if (ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1)
|
if(ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1)
|
||||||
set(OPENCV_EXTRA_C_FLAGS_RELEASE "${OPENCV_EXTRA_C_FLAGS_RELEASE} /Oi")
|
set(OPENCV_EXTRA_C_FLAGS_RELEASE "${OPENCV_EXTRA_C_FLAGS_RELEASE} /Oi")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
@ -188,4 +185,8 @@ if (WIN32 AND MSVC)
|
|||||||
|
|
||||||
string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
string(REPLACE "/Zm1000" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
string(REPLACE "/Zm1000" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
||||||
|
|
||||||
|
if(NOT ENABLE_NOISY_WARNINGS)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") #class 'std::XXX' needs to have dll-interface to be used by clients of YYY
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -166,7 +166,7 @@ namespace colormap
|
|||||||
static Mat linear_colormap(InputArray X,
|
static Mat linear_colormap(InputArray X,
|
||||||
InputArray r, InputArray g, InputArray b,
|
InputArray r, InputArray g, InputArray b,
|
||||||
float begin, float end, float n) {
|
float begin, float end, float n) {
|
||||||
return linear_colormap(X,r,g,b,linspace(begin,end,n));
|
return linear_colormap(X,r,g,b,linspace(begin,end, cvRound(n)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Interpolates from a base colormap.
|
// Interpolates from a base colormap.
|
||||||
|
@ -117,7 +117,7 @@ public:
|
|||||||
void train(InputArray src, InputArray labels);
|
void train(InputArray src, InputArray labels);
|
||||||
|
|
||||||
// Predicts the label of a query image in src.
|
// Predicts the label of a query image in src.
|
||||||
int predict(const InputArray src) const;
|
int predict(InputArray src) const;
|
||||||
|
|
||||||
// See FaceRecognizer::load.
|
// See FaceRecognizer::load.
|
||||||
void load(const FileStorage& fs);
|
void load(const FileStorage& fs);
|
||||||
@ -495,8 +495,8 @@ inline void elbp_(InputArray _src, OutputArray _dst, int radius, int neighbors)
|
|||||||
dst.setTo(0);
|
dst.setTo(0);
|
||||||
for(int n=0; n<neighbors; n++) {
|
for(int n=0; n<neighbors; n++) {
|
||||||
// sample points
|
// sample points
|
||||||
float x = static_cast<float>(-radius) * sin(2.0*CV_PI*n/static_cast<float>(neighbors));
|
float x = static_cast<float>(-radius * sin(2.0*CV_PI*n/static_cast<float>(neighbors)));
|
||||||
float y = static_cast<float>(radius) * cos(2.0*CV_PI*n/static_cast<float>(neighbors));
|
float y = static_cast<float>(radius * cos(2.0*CV_PI*n/static_cast<float>(neighbors)));
|
||||||
// relative indices
|
// relative indices
|
||||||
int fx = static_cast<int>(floor(x));
|
int fx = static_cast<int>(floor(x));
|
||||||
int fy = static_cast<int>(floor(y));
|
int fy = static_cast<int>(floor(y));
|
||||||
@ -514,7 +514,7 @@ inline void elbp_(InputArray _src, OutputArray _dst, int radius, int neighbors)
|
|||||||
for(int i=radius; i < src.rows-radius;i++) {
|
for(int i=radius; i < src.rows-radius;i++) {
|
||||||
for(int j=radius;j < src.cols-radius;j++) {
|
for(int j=radius;j < src.cols-radius;j++) {
|
||||||
// calculate interpolated value
|
// calculate interpolated value
|
||||||
float t = w1*src.at<_Tp>(i+fy,j+fx) + w2*src.at<_Tp>(i+fy,j+cx) + w3*src.at<_Tp>(i+cy,j+fx) + w4*src.at<_Tp>(i+cy,j+cx);
|
float t = static_cast<float>(w1*src.at<_Tp>(i+fy,j+fx) + w2*src.at<_Tp>(i+fy,j+cx) + w3*src.at<_Tp>(i+cy,j+fx) + w4*src.at<_Tp>(i+cy,j+cx));
|
||||||
// floating point precision, so check some machine-dependent epsilon
|
// floating point precision, so check some machine-dependent epsilon
|
||||||
dst.at<int>(i-radius,j-radius) += ((t > src.at<_Tp>(i,j)) || (std::abs(t-src.at<_Tp>(i,j)) < std::numeric_limits<float>::epsilon())) << n;
|
dst.at<int>(i-radius,j-radius) += ((t > src.at<_Tp>(i,j)) || (std::abs(t-src.at<_Tp>(i,j)) < std::numeric_limits<float>::epsilon())) << n;
|
||||||
}
|
}
|
||||||
@ -543,7 +543,7 @@ histc_(const Mat& src, int minVal=0, int maxVal=255, bool normed=false)
|
|||||||
// Establish the number of bins.
|
// Establish the number of bins.
|
||||||
int histSize = maxVal-minVal+1;
|
int histSize = maxVal-minVal+1;
|
||||||
// Set the ranges.
|
// Set the ranges.
|
||||||
float range[] = { minVal, maxVal } ;
|
float range[] = { static_cast<float>(minVal), static_cast<float>(maxVal) };
|
||||||
const float* histRange = { range };
|
const float* histRange = { range };
|
||||||
// calc histogram
|
// calc histogram
|
||||||
calcHist(&src, 1, 0, Mat(), result, 1, &histSize, &histRange, true, false);
|
calcHist(&src, 1, 0, Mat(), result, 1, &histSize, &histRange, true, false);
|
||||||
|
@ -442,7 +442,7 @@ void cv::Mesh3D::clearOctree(){ octree = Octree(); }
|
|||||||
|
|
||||||
float cv::Mesh3D::estimateResolution(float tryRatio)
|
float cv::Mesh3D::estimateResolution(float tryRatio)
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
const int neighbors = 3;
|
const int neighbors = 3;
|
||||||
const int minReasonable = 10;
|
const int minReasonable = 10;
|
||||||
|
|
||||||
@ -476,10 +476,10 @@ float cv::Mesh3D::estimateResolution(float tryRatio)
|
|||||||
sort(dist, less<double>());
|
sort(dist, less<double>());
|
||||||
|
|
||||||
return resolution = (float)dist[ dist.size() / 2 ];
|
return resolution = (float)dist[ dist.size() / 2 ];
|
||||||
#else
|
#else
|
||||||
CV_Error(CV_StsNotImplemented, "");
|
CV_Error(CV_StsNotImplemented, "");
|
||||||
return 1.f;
|
return 1.f;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -3030,8 +3030,13 @@ read( FileNodeIterator& it, vector<_Tp>& vec, size_t maxCount=(size_t)INT_MAX )
|
|||||||
template<typename _Tp> static inline void
|
template<typename _Tp> static inline void
|
||||||
read( const FileNode& node, vector<_Tp>& vec, const vector<_Tp>& default_value=vector<_Tp>() )
|
read( const FileNode& node, vector<_Tp>& vec, const vector<_Tp>& default_value=vector<_Tp>() )
|
||||||
{
|
{
|
||||||
|
if(!node.node)
|
||||||
|
vec = default_value;
|
||||||
|
else
|
||||||
|
{
|
||||||
FileNodeIterator it = node.begin();
|
FileNodeIterator it = node.begin();
|
||||||
read( it, vec );
|
read( it, vec );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline FileNodeIterator FileNode::begin() const
|
inline FileNodeIterator FileNode::begin() const
|
||||||
|
@ -195,7 +195,7 @@ DenseFeatureDetector::DenseFeatureDetector( float _initFeatureScale, int _featur
|
|||||||
|
|
||||||
void DenseFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask ) const
|
void DenseFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypoints, const Mat& mask ) const
|
||||||
{
|
{
|
||||||
float curScale = initFeatureScale;
|
float curScale = static_cast<float>(initFeatureScale);
|
||||||
int curStep = initXyStep;
|
int curStep = initXyStep;
|
||||||
int curBound = initImgBound;
|
int curBound = initImgBound;
|
||||||
for( int curLevel = 0; curLevel < featureScaleLevels; curLevel++ )
|
for( int curLevel = 0; curLevel < featureScaleLevels; curLevel++ )
|
||||||
@ -208,7 +208,7 @@ void DenseFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>& keypo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
curScale = curScale * featureScaleMul;
|
curScale = static_cast<float>(curScale * featureScaleMul);
|
||||||
if( varyXyStepWithScale ) curStep = static_cast<int>( curStep * featureScaleMul + 0.5f );
|
if( varyXyStepWithScale ) curStep = static_cast<int>( curStep * featureScaleMul + 0.5f );
|
||||||
if( varyImgBoundWithScale ) curBound = static_cast<int>( curBound * featureScaleMul + 0.5f );
|
if( varyImgBoundWithScale ) curBound = static_cast<int>( curBound * featureScaleMul + 0.5f );
|
||||||
}
|
}
|
||||||
|
@ -33,18 +33,20 @@ if (HAVE_CUDA)
|
|||||||
#set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-keep")
|
#set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-keep")
|
||||||
#set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;/EHsc-;")
|
#set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;/EHsc-;")
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
if(NOT ENABLE_NOISY_WARNINGS)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4211 /wd4201 /wd4100 /wd4505 /wd4408")
|
||||||
|
|
||||||
foreach(var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG)
|
foreach(var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG)
|
||||||
string(REPLACE "/W4" "/W3" ${var} "${${var}}")
|
string(REPLACE "/W4" "/W3" ${var} "${${var}}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if(MSVC)
|
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler /wd4251)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4211 /wd4201 /wd4100 /wd4505 /wd4408 /wd4251")
|
endif()
|
||||||
|
|
||||||
foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG)
|
foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG)
|
||||||
string(REPLACE "/EHsc-" "/EHs" ${var} "${${var}}")
|
string(REPLACE "/EHsc-" "/EHs" ${var} "${${var}}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler /wd4251)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
OCV_CUDA_COMPILE(cuda_objs ${lib_cuda} ${ncv_cuda})
|
OCV_CUDA_COMPILE(cuda_objs ${lib_cuda} ${ncv_cuda})
|
||||||
|
@ -195,7 +195,7 @@ Mat getMat(InputArray arr)
|
|||||||
return arr.getMat();
|
return arr.getMat();
|
||||||
}
|
}
|
||||||
|
|
||||||
double checkNorm(InputArray m1, const InputArray m2)
|
double checkNorm(InputArray m1, InputArray m2)
|
||||||
{
|
{
|
||||||
return norm(getMat(m1), getMat(m2), NORM_INF);
|
return norm(getMat(m1), getMat(m2), NORM_INF);
|
||||||
}
|
}
|
||||||
|
@ -267,7 +267,7 @@ set_target_properties(${the_module} PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
|||||||
|
|
||||||
ocv_add_precompiled_headers(${the_module})
|
ocv_add_precompiled_headers(${the_module})
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -3321,9 +3321,9 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
|
|||||||
{
|
{
|
||||||
if( width != VI.getWidth(index) || height != VI.getHeight(index) )//|| fourcc != VI.getFourcc(index) )
|
if( width != VI.getWidth(index) || height != VI.getHeight(index) )//|| fourcc != VI.getFourcc(index) )
|
||||||
{
|
{
|
||||||
int fps = VI.getFPS(index);
|
int fps = static_cast<int>(VI.getFPS(index));
|
||||||
VI.stopDevice(index);
|
VI.stopDevice(index);
|
||||||
VI.setIdealFramerate(index,fps);
|
VI.setIdealFramerate(index, fps);
|
||||||
VI.setupDeviceFourcc(index, width, height, fourcc);
|
VI.setupDeviceFourcc(index, width, height, fourcc);
|
||||||
}
|
}
|
||||||
width = height = fourcc = -1;
|
width = height = fourcc = -1;
|
||||||
|
@ -308,7 +308,7 @@ pyrDown_( const Mat& _src, Mat& _dst, int borderType )
|
|||||||
|
|
||||||
|
|
||||||
template<class CastOp, class VecOp> void
|
template<class CastOp, class VecOp> void
|
||||||
pyrUp_( const Mat& _src, Mat& _dst, int borderType )
|
pyrUp_( const Mat& _src, Mat& _dst, int)
|
||||||
{
|
{
|
||||||
const int PU_SZ = 3;
|
const int PU_SZ = 3;
|
||||||
typedef typename CastOp::type1 WT;
|
typedef typename CastOp::type1 WT;
|
||||||
|
@ -70,7 +70,13 @@ set_target_properties(${the_module} PROPERTIES
|
|||||||
|
|
||||||
if(MSVC AND NOT BUILD_SHARED_LIBS)
|
if(MSVC AND NOT BUILD_SHARED_LIBS)
|
||||||
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
|
set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
|
endif()
|
||||||
|
|
||||||
|
if(MSVC AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100") #unreferenced formal parameter
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127") #conditional expression is constant
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4505") #unreferenced local function has been removed
|
||||||
|
string(REPLACE "/W4" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
@ -14,8 +14,8 @@ ocv_create_module()
|
|||||||
|
|
||||||
if(BUILD_SHARED_LIBS AND NOT MINGW)
|
if(BUILD_SHARED_LIBS AND NOT MINGW)
|
||||||
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
|
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
|
||||||
if (MSVC)
|
if (MSVC AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
add_definitions( "/wd4251 /wd4275")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=0)
|
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=0)
|
||||||
|
@ -147,7 +147,7 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
|
|||||||
storageOutPath += ext;
|
storageOutPath += ext;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch(cv::Exception& ex)
|
catch(cv::Exception&)
|
||||||
{
|
{
|
||||||
LOGE("Failed to open sanity data for reading: %s", storageInPath.c_str());
|
LOGE("Failed to open sanity data for reading: %s", storageInPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,8 @@ void FastMarchingMethod::heapDown(int idx)
|
|||||||
if (l < size_ && narrowBand_[l] < narrowBand_[smallest]) smallest = l;
|
if (l < size_ && narrowBand_[l] < narrowBand_[smallest]) smallest = l;
|
||||||
if (r < size_ && narrowBand_[r] < narrowBand_[smallest]) smallest = r;
|
if (r < size_ && narrowBand_[r] < narrowBand_[smallest]) smallest = r;
|
||||||
|
|
||||||
if (smallest == idx) break;
|
if (smallest == idx)
|
||||||
|
break;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::swap(indexOf(narrowBand_[idx]), indexOf(narrowBand_[smallest]));
|
std::swap(indexOf(narrowBand_[idx]), indexOf(narrowBand_[smallest]));
|
||||||
|
@ -292,7 +292,9 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
Point3_<uchar> cp = frame1(py1,px1), cq = frame1(qy1,qx1);
|
Point3_<uchar> cp = frame1(py1,px1), cq = frame1(qy1,qx1);
|
||||||
float distColor = sqr(cp.x-cq.x) + sqr(cp.y-cq.y) + sqr(cp.z-cq.z);
|
float distColor = sqr(static_cast<float>(cp.x-cq.x))
|
||||||
|
+ sqr(static_cast<float>(cp.y-cq.y))
|
||||||
|
+ sqr(static_cast<float>(cp.z-cq.z));
|
||||||
float w = 1.f / (sqrt(distColor * (dx*dx + dy*dy)) + eps);
|
float w = 1.f / (sqrt(distColor * (dx*dx + dy*dy)) + eps);
|
||||||
|
|
||||||
uEst += w * (flowX(qy0,qx0) - dudx*dx - dudy*dy);
|
uEst += w * (flowX(qy0,qx0) - dudx*dx - dudy*dy);
|
||||||
|
@ -12,7 +12,7 @@ ocv_check_dependencies(${OPENCV_C_SAMPLES_REQUIRED_DEPS})
|
|||||||
if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||||
project(c_samples)
|
project(c_samples)
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
|||||||
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
|
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
|||||||
ocv_include_directories(${CUDA_INCLUDE_DIRS})
|
ocv_include_directories(${CUDA_INCLUDE_DIRS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user