diff --git a/modules/calib3d/src/usac/dls_solver.cpp b/modules/calib3d/src/usac/dls_solver.cpp index 76e7e5d645..1e1cf6c34d 100644 --- a/modules/calib3d/src/usac/dls_solver.cpp +++ b/modules/calib3d/src/usac/dls_solver.cpp @@ -44,6 +44,10 @@ #elif defined(HAVE_LAPACK) #include "opencv_lapack.h" #endif +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif namespace cv { namespace usac { class DLSPnPImpl : public DLSPnP { @@ -890,3 +894,7 @@ Ptr DLSPnP::create(const Mat &points_, const Mat &calib_norm_pts, const return makePtr(points_, calib_norm_pts, K); } }} + +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic pop +#endif diff --git a/modules/calib3d/src/usac/essential_solver.cpp b/modules/calib3d/src/usac/essential_solver.cpp index 8f9b5b9d33..dfff4b970b 100644 --- a/modules/calib3d/src/usac/essential_solver.cpp +++ b/modules/calib3d/src/usac/essential_solver.cpp @@ -9,6 +9,10 @@ #elif defined(HAVE_LAPACK) #include "opencv_lapack.h" #endif +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif namespace cv { namespace usac { /* @@ -354,3 +358,7 @@ Ptr EssentialMinimalSolver5pts::create return makePtr(points_, use_svd, is_nister); } }} + +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic pop +#endif \ No newline at end of file diff --git a/modules/calib3d/src/usac/pnp_solver.cpp b/modules/calib3d/src/usac/pnp_solver.cpp index 24c06ac22b..044a7da9ff 100644 --- a/modules/calib3d/src/usac/pnp_solver.cpp +++ b/modules/calib3d/src/usac/pnp_solver.cpp @@ -11,6 +11,10 @@ #elif defined(HAVE_LAPACK) #include "opencv_lapack.h" #endif +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif namespace cv { namespace usac { class PnPMinimalSolver6PtsImpl : public PnPMinimalSolver6Pts { @@ -412,3 +416,7 @@ Ptr P3PSolver::create(const Mat &points_, const Mat &calib_norm_pts, return makePtr(points_, calib_norm_pts, K); } }} + +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic pop +#endif \ No newline at end of file diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp index f3f23a3b3c..d15cbb7ad3 100644 --- a/modules/core/src/hal_internal.cpp +++ b/modules/core/src/hal_internal.cpp @@ -77,6 +77,11 @@ __msan_unpoison(address, size) #define CV_ANNOTATE_NO_SANITIZE_MEMORY #endif +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + //lapack stores matrices in column-major order so transposing is needed everywhere template static inline void transpose_square_inplace(fptype *src, size_t src_ld, size_t m) @@ -701,4 +706,8 @@ int lapack_gemm64fc(const double *src1, size_t src1_step, const double *src2, si return lapack_gemm_c(src1, src1_step, src2, src2_step, alpha, src3, src3_step, beta, dst, dst_step, m, n, k, flags); } -#endif //HAVE_LAPACK +#if defined(__APPLE__) && defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif //HAVE_LAPACK \ No newline at end of file