提交 ccfc34b1 编写于 作者: A Andrey Senyaev

Disabled compiling warnings in case of symbols in cmake for 4.x

上级 a42b3559
...@@ -120,6 +120,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64 ...@@ -120,6 +120,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244) # vs2008 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244) # vs2008
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267) # vs2008 Win64 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267) # vs2008 Win64
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4456) # vs2015 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4456) # vs2015
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4819) # vs2019 Win64
if(MSVC AND CV_ICC) if(MSVC AND CV_ICC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qrestrict") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qrestrict")
......
...@@ -39,6 +39,8 @@ ocv_warnings_disable(CMAKE_C_FLAGS ...@@ -39,6 +39,8 @@ ocv_warnings_disable(CMAKE_C_FLAGS
-Wunused-function # v2.4.0: Clang -Wunused-function # v2.4.0: Clang
) )
ocv_warnings_disable(CMAKE_C_FLAGS /wd4819) # vs2019 Win64
add_library(${OPENJPEG_LIBRARY_NAME} STATIC ${OPENJPEG_SRCS}) add_library(${OPENJPEG_LIBRARY_NAME} STATIC ${OPENJPEG_SRCS})
target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC)
......
...@@ -437,6 +437,7 @@ if(MSVC) ...@@ -437,6 +437,7 @@ 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 /wd4512) # Assignment operator could not be generated ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # Assignment operator could not be generated
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'
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4819) # Symbols like delta or epsilon cannot be represented
endif() endif()
if(CV_ICC AND NOT ENABLE_NOISY_WARNINGS) if(CV_ICC AND NOT ENABLE_NOISY_WARNINGS)
......
...@@ -839,7 +839,7 @@ static void calibrateRobotWorldHandEyeShah(const std::vector<Mat_<double>>& cRw, ...@@ -839,7 +839,7 @@ static void calibrateRobotWorldHandEyeShah(const std::vector<Mat_<double>>& cRw,
//Reference: //Reference:
//A. Li, L. Wang, and D. Wu, "Simultaneous robot-world and hand-eye calibration using dual-quaternions and kronecker product" //A. Li, L. Wang, and D. Wu, "Simultaneous robot-world and hand-eye calibration using dual-quaternions and kronecker product"
//International Journal of Physical Sciences, vol. 5, pp. 15301536, 2010. //International Journal of Physical Sciences, vol. 5, pp. 1530-1536, 2010.
//Matlab code: http://math.loyola.edu/~mili/Calibration/ //Matlab code: http://math.loyola.edu/~mili/Calibration/
static void calibrateRobotWorldHandEyeLi(const std::vector<Mat_<double>>& cRw, const std::vector<Mat_<double>>& ctw, static void calibrateRobotWorldHandEyeLi(const std::vector<Mat_<double>>& cRw, const std::vector<Mat_<double>>& ctw,
const std::vector<Mat_<double>>& gRb, const std::vector<Mat_<double>>& gtb, const std::vector<Mat_<double>>& gRb, const std::vector<Mat_<double>>& gtb,
......
...@@ -406,14 +406,14 @@ struct SPRT_history { ...@@ -406,14 +406,14 @@ struct SPRT_history {
/* /*
* delta: * delta:
* The probability of a data point being consistent * The probability of a data point being consistent
* with a ‘bad’ model is modeled as a probability of * with a 'bad' model is modeled as a probability of
* a random event with Bernoulli distribution with parameter * a random event with Bernoulli distribution with parameter
* δ : p(1|Hb) = δ. * delta : p(1|Hb) = delta.
* epsilon: * epsilon:
* The probability p(1|Hg) = ε * The probability p(1|Hg) = epsilon
* that any randomly chosen data point is consistent with a ‘good’ model * that any randomly chosen data point is consistent with a 'good' model
* is approximated by the fraction of inliers ε among the data * is approximated by the fraction of inliers epsilon among the data
* points * points
* A is the decision threshold, the only parameter of the Adapted SPRT * A is the decision threshold, the only parameter of the Adapted SPRT
......
...@@ -694,8 +694,16 @@ public: ...@@ -694,8 +694,16 @@ public:
//! Allocates a new GpuMat of given size and type. //! Allocates a new GpuMat of given size and type.
CV_WRAP GpuMat getBuffer(int rows, int cols, int type); CV_WRAP GpuMat getBuffer(int rows, int cols, int type);
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
//! Allocates a new GpuMat of given size and type. //! Allocates a new GpuMat of given size and type.
CV_WRAP GpuMat getBuffer(Size size, int type) { return getBuffer(size.height, size.width, type); } CV_WRAP GpuMat getBuffer(Size size, int type) { return getBuffer(size.height, size.width, type); }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
//! Returns the allocator associated with the stream. //! Returns the allocator associated with the stream.
CV_WRAP Ptr<GpuMat::Allocator> getAllocator() const { return allocator_; } CV_WRAP Ptr<GpuMat::Allocator> getAllocator() const { return allocator_; }
......
...@@ -75,6 +75,11 @@ GpuMat::GpuMat(Size size_, int type_, Allocator* allocator_) ...@@ -75,6 +75,11 @@ GpuMat::GpuMat(Size size_, int type_, Allocator* allocator_)
create(size_.height, size_.width, type_); create(size_.height, size_.width, type_);
} }
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
GpuMat::GpuMat(int rows_, int cols_, int type_, Scalar s_, Allocator* allocator_) GpuMat::GpuMat(int rows_, int cols_, int type_, Scalar s_, Allocator* allocator_)
: flags(0), rows(0), cols(0), step(0), data(0), refcount(0), datastart(0), dataend(0), allocator(allocator_) : flags(0), rows(0), cols(0), step(0), data(0), refcount(0), datastart(0), dataend(0), allocator(allocator_)
...@@ -96,6 +101,9 @@ GpuMat::GpuMat(Size size_, int type_, Scalar s_, Allocator* allocator_) ...@@ -96,6 +101,9 @@ GpuMat::GpuMat(Size size_, int type_, Scalar s_, Allocator* allocator_)
setTo(s_); setTo(s_);
} }
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline inline
GpuMat::GpuMat(const GpuMat& m) GpuMat::GpuMat(const GpuMat& m)
...@@ -158,11 +166,19 @@ GpuMat GpuMat::clone() const ...@@ -158,11 +166,19 @@ GpuMat GpuMat::clone() const
return m; return m;
} }
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
void GpuMat::copyTo(OutputArray dst, InputArray mask) const void GpuMat::copyTo(OutputArray dst, InputArray mask) const
{ {
copyTo(dst, mask, Stream::Null()); copyTo(dst, mask, Stream::Null());
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline inline
GpuMat& GpuMat::setTo(Scalar s) GpuMat& GpuMat::setTo(Scalar s)
...@@ -176,6 +192,11 @@ GpuMat& GpuMat::setTo(Scalar s, InputArray mask) ...@@ -176,6 +192,11 @@ GpuMat& GpuMat::setTo(Scalar s, InputArray mask)
return setTo(s, mask, Stream::Null()); return setTo(s, mask, Stream::Null());
} }
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
void GpuMat::convertTo(OutputArray dst, int rtype) const void GpuMat::convertTo(OutputArray dst, int rtype) const
{ {
...@@ -187,6 +208,9 @@ void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, double beta) co ...@@ -187,6 +208,9 @@ void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, double beta) co
{ {
convertTo(dst, rtype, alpha, beta, Stream::Null()); convertTo(dst, rtype, alpha, beta, Stream::Null());
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline inline
void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, Stream& stream) const void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, Stream& stream) const
...@@ -646,6 +670,11 @@ Event::Event(const Ptr<Impl>& impl) ...@@ -646,6 +670,11 @@ Event::Event(const Ptr<Impl>& impl)
// Initialization & Info // Initialization & Info
//=================================================================================== //===================================================================================
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
bool TargetArchs::has(int major, int minor) bool TargetArchs::has(int major, int minor)
{ {
...@@ -663,6 +692,9 @@ DeviceInfo::DeviceInfo() ...@@ -663,6 +692,9 @@ DeviceInfo::DeviceInfo()
{ {
device_id_ = getDevice(); device_id_ = getDevice();
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline inline
DeviceInfo::DeviceInfo(int device_id) DeviceInfo::DeviceInfo(int device_id)
...@@ -671,6 +703,11 @@ DeviceInfo::DeviceInfo(int device_id) ...@@ -671,6 +703,11 @@ DeviceInfo::DeviceInfo(int device_id)
device_id_ = device_id; device_id_ = device_id;
} }
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
int DeviceInfo::deviceID() const int DeviceInfo::deviceID() const
{ {
...@@ -699,6 +736,9 @@ bool DeviceInfo::supports(FeatureSet feature_set) const ...@@ -699,6 +736,9 @@ bool DeviceInfo::supports(FeatureSet feature_set) const
int version = majorVersion() * 10 + minorVersion(); int version = majorVersion() * 10 + minorVersion();
return version >= feature_set; return version >= feature_set;
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
......
...@@ -675,11 +675,19 @@ Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp ...@@ -675,11 +675,19 @@ Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp
for(int i = 16; i < channels; i++) val[i] = _Tp(0); for(int i = 16; i < channels; i++) val[i] = _Tp(0);
} }
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
template<typename _Tp, int m, int n> inline template<typename _Tp, int m, int n> inline
Matx<_Tp, m, n>::Matx(const _Tp* values) Matx<_Tp, m, n>::Matx(const _Tp* values)
{ {
for( int i = 0; i < channels; i++ ) val[i] = values[i]; for( int i = 0; i < channels; i++ ) val[i] = values[i];
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
template<typename _Tp, int m, int n> inline template<typename _Tp, int m, int n> inline
Matx<_Tp, m, n>::Matx(std::initializer_list<_Tp> list) Matx<_Tp, m, n>::Matx(std::initializer_list<_Tp> list)
......
...@@ -703,10 +703,18 @@ cv::ogl::Texture2D::Format cv::ogl::Texture2D::format() const ...@@ -703,10 +703,18 @@ cv::ogl::Texture2D::Format cv::ogl::Texture2D::format() const
/////// ///////
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline inline
cv::ogl::Arrays::Arrays() : size_(0) cv::ogl::Arrays::Arrays() : size_(0)
{ {
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline inline
int cv::ogl::Arrays::size() const int cv::ogl::Arrays::size() const
......
...@@ -36,7 +36,7 @@ namespace cv { namespace utils { namespace fs { ...@@ -36,7 +36,7 @@ namespace cv { namespace utils { namespace fs {
* Provides interprocess synchronization mechanism. * Provides interprocess synchronization mechanism.
* Platform dependent. * Platform dependent.
* *
* Supports multiple readers / single writer access pattern (RW / readerswriter / shared-exclusive lock). * Supports multiple readers / single writer access pattern (RW / readers-writer / shared-exclusive lock).
* *
* File must exist. * File must exist.
* File can't be re-used (for example, I/O operations via std::fstream is not safe) * File can't be re-used (for example, I/O operations via std::fstream is not safe)
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
/* /*
Guoshen Yu, Jean-Michel Morel, ASIFT: An Algorithm for Fully Affine Guoshen Yu, Jean-Michel Morel, ASIFT: An Algorithm for Fully Affine
Invariant Comparison, Image Processing On Line, 1 (2011), pp. 1138. Invariant Comparison, Image Processing On Line, 1 (2011), pp. 11-38.
https://doi.org/10.5201/ipol.2011.my-asift https://doi.org/10.5201/ipol.2011.my-asift
*/ */
......
...@@ -318,9 +318,9 @@ TEST(Objdetect_QRCode_Encode_Kanji, regression) ...@@ -318,9 +318,9 @@ TEST(Objdetect_QRCode_Encode_Kanji, regression)
Mat qrcode; Mat qrcode;
const int testing_versions = 3; const int testing_versions = 3;
std::string input_infos[testing_versions] = {"\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x90\xa2\x8a\x45", // こんにちは世界 std::string input_infos[testing_versions] = {"\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x90\xa2\x8a\x45", // "Hello World" in Japanese
"\x82\xa8\x95\xa0\x82\xaa\x8b\xf3\x82\xa2\x82\xc4\x82\xa2\x82\xdc\x82\xb7", // お腹が空いています "\x82\xa8\x95\xa0\x82\xaa\x8b\xf3\x82\xa2\x82\xc4\x82\xa2\x82\xdc\x82\xb7", // "I am hungry" in Japanese
"\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x81\x41\x8e\x84\x82\xcd\x8f\xad\x82\xb5\x93\xfa\x96\x7b\x8c\xea\x82\xf0\x98\x62\x82\xb5\x82\xdc\x82\xb7" // こんにちは、私は少し日本語を話します "\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x81\x41\x8e\x84\x82\xcd\x8f\xad\x82\xb5\x93\xfa\x96\x7b\x8c\xea\x82\xf0\x98\x62\x82\xb5\x82\xdc\x82\xb7" // "Hello, I speak a little Japanese" in Japanese
}; };
for (int i = 0; i < testing_versions; i++) for (int i = 0; i < testing_versions; i++)
......
...@@ -503,6 +503,11 @@ class CV_EXPORTS PlaneWarperGpu : public PlaneWarper ...@@ -503,6 +503,11 @@ class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
public: public:
PlaneWarperGpu(float scale = 1.f) : PlaneWarper(scale) {} PlaneWarperGpu(float scale = 1.f) : PlaneWarper(scale) {}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
{ {
Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_); Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
...@@ -536,6 +541,9 @@ public: ...@@ -536,6 +541,9 @@ public:
d_dst_.download(dst); d_dst_.download(dst);
return result; return result;
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap); Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
...@@ -557,6 +565,11 @@ class CV_EXPORTS SphericalWarperGpu : public SphericalWarper ...@@ -557,6 +565,11 @@ class CV_EXPORTS SphericalWarperGpu : public SphericalWarper
public: public:
SphericalWarperGpu(float scale) : SphericalWarper(scale) {} SphericalWarperGpu(float scale) : SphericalWarper(scale) {}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
{ {
Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_); Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
...@@ -573,6 +586,9 @@ public: ...@@ -573,6 +586,9 @@ public:
d_dst_.download(dst); d_dst_.download(dst);
return result; return result;
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap); Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
...@@ -589,6 +605,11 @@ class CV_EXPORTS CylindricalWarperGpu : public CylindricalWarper ...@@ -589,6 +605,11 @@ class CV_EXPORTS CylindricalWarperGpu : public CylindricalWarper
public: public:
CylindricalWarperGpu(float scale) : CylindricalWarper(scale) {} CylindricalWarperGpu(float scale) : CylindricalWarper(scale) {}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
{ {
Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_); Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
...@@ -605,6 +626,9 @@ public: ...@@ -605,6 +626,9 @@ public:
d_dst_.download(dst); d_dst_.download(dst);
return result; return result;
} }
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap); Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册