Fixed couple of MSVC warnings
This commit is contained in:
@@ -43,10 +43,6 @@ if (HAVE_CUDA)
|
||||
|
||||
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler /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)
|
||||
string(REPLACE "/EHsc-" "/EHs" ${var} "${${var}}")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
OCV_CUDA_COMPILE(cuda_objs ${lib_cuda} ${ncv_cuda})
|
||||
|
@@ -113,7 +113,7 @@ public:
|
||||
private:
|
||||
// To avoid GCGraph dependency
|
||||
class Impl;
|
||||
Ptr<Impl> impl_;
|
||||
Ptr<PairwiseSeamFinder> impl_;
|
||||
};
|
||||
|
||||
|
||||
|
@@ -96,7 +96,7 @@ void FastMarchingMethod::heapUp(int idx)
|
||||
void FastMarchingMethod::heapDown(int idx)
|
||||
{
|
||||
int l, r, smallest;
|
||||
while (true)
|
||||
for(;;)
|
||||
{
|
||||
l = 2*idx+1;
|
||||
r = 2*idx+2;
|
||||
|
Reference in New Issue
Block a user