Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
dbbbad40
Commit
dbbbad40
authored
Dec 07, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: eliminate ICC warnings
parent
540ece74
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+6
-0
test_arithm.cpp
modules/core/test/test_arithm.cpp
+1
-5
No files found.
cmake/OpenCVCompilerOptions.cmake
View file @
dbbbad40
...
@@ -436,6 +436,12 @@ if(MSVC)
...
@@ -436,6 +436,12 @@ if(MSVC)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4275
)
# non dll-interface class 'std::exception' used as base for dll-interface class 'cv::Exception'
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4275
)
# non dll-interface class 'std::exception' used as base for dll-interface class 'cv::Exception'
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4589
)
# Constructor of abstract class 'cv::ORB' ignores initializer for virtual base class 'cv::Algorithm'
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4589
)
# Constructor of abstract class 'cv::ORB' ignores initializer for virtual base class 'cv::Algorithm'
endif
()
endif
()
if
(
CV_ICC AND NOT ENABLE_NOISY_WARNINGS
)
foreach
(
flags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG
)
string
(
REGEX REPLACE
"( |^)/W[0-9]+( |$)"
"
\\
1
\\
2"
${
flags
}
"
${${
flags
}}
"
)
endforeach
()
endif
()
endif
()
endif
()
if
(
APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{LDFLAGS} AND EXISTS
"/usr/local/lib"
)
if
(
APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{LDFLAGS} AND EXISTS
"/usr/local/lib"
)
...
...
modules/core/test/test_arithm.cpp
View file @
dbbbad40
#include "test_precomp.hpp"
#include "test_precomp.hpp"
#include <cmath>
#include <cmath>
#ifndef NAN
#include <limits> // numeric_limits<T>::quiet_NaN()
#define NAN std::numeric_limits<float>::quiet_NaN()
#endif
using
namespace
cv
;
using
namespace
cv
;
using
namespace
std
;
using
namespace
std
;
...
@@ -1895,7 +1891,7 @@ TEST(MinMaxLoc, regression_4955_nans)
...
@@ -1895,7 +1891,7 @@ TEST(MinMaxLoc, regression_4955_nans)
cv
::
Mat
one_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
1
));
cv
::
Mat
one_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
1
));
cv
::
minMaxLoc
(
one_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
cv
::
minMaxLoc
(
one_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
cv
::
Mat
nan_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
NAN
));
cv
::
Mat
nan_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
std
::
numeric_limits
<
float
>::
quiet_NaN
()
));
cv
::
minMaxLoc
(
nan_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
cv
::
minMaxLoc
(
nan_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment