From 215499d2c4206115b4bca1e5b01e67d197dba0ca Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Fri, 2 Feb 2024 17:04:10 +0100 Subject: [PATCH] Disable sift testing when opencv 4.9.0 is used. Breaks macos-13 ci --- .../vision/test/keypoint-with-dataset/testKeyPoint-5.cpp | 4 +++- .../vision/test/keypoint-with-dataset/testKeyPoint-7.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/vision/test/keypoint-with-dataset/testKeyPoint-5.cpp b/modules/vision/test/keypoint-with-dataset/testKeyPoint-5.cpp index d896830b4e..203f764ac9 100644 --- a/modules/vision/test/keypoint-with-dataset/testKeyPoint-5.cpp +++ b/modules/vision/test/keypoint-with-dataset/testKeyPoint-5.cpp @@ -211,6 +211,7 @@ void run_test(const std::string &env_ipath, bool opt_click_allowed, bool opt_dis (VISP_HAVE_OPENCV_VERSION >= 0x030411 && CV_MAJOR_VERSION < 4) || (VISP_HAVE_OPENCV_VERSION >= 0x040400) #if (VISP_HAVE_OPENCV_VERSION != 0x040504) && (VISP_HAVE_OPENCV_VERSION != 0x040505) && \ (VISP_HAVE_OPENCV_VERSION != 0x040600) && (VISP_HAVE_OPENCV_VERSION != 0x040700) && \ + (VISP_HAVE_OPENCV_VERSION != 0x040900) && \ (defined(__APPLE__) && defined(__MACH__)) // SIFT is known to be unstable with OpenCV 4.5.4 and 4.5.5 on macOS (see #1048) // Same for OpenCV 4.6.0 (see #1106) where it produces an Illegal Instruction error when OpenCV 4.6.0 is @@ -262,7 +263,8 @@ void run_test(const std::string &env_ipath, bool opt_click_allowed, bool opt_dis #if defined(VISP_HAVE_OPENCV_NONFREE) || defined(VISP_HAVE_OPENCV_XFEATURES2D) || \ (VISP_HAVE_OPENCV_VERSION >= 0x030411 && CV_MAJOR_VERSION < 4) || (VISP_HAVE_OPENCV_VERSION >= 0x040400) #if ((VISP_HAVE_OPENCV_VERSION == 0x040504) || (VISP_HAVE_OPENCV_VERSION == 0x040505) || \ - (VISP_HAVE_OPENCV_VERSION == 0x040600) || (VISP_HAVE_OPENCV_VERSION == 0x040700)) && \ + (VISP_HAVE_OPENCV_VERSION == 0x040600) || (VISP_HAVE_OPENCV_VERSION == 0x040700) || \ + (VISP_HAVE_OPENCV_VERSION == 0x040900)) && \ (defined(__APPLE__) && defined(__MACH__)) // SIFT is known to be unstable with OpenCV 4.5.4 and 4.5.5 on macOS (see #1048) // Same for OpenCV 4.6.0 (see #1106) where it produces an Illegal Instruction error when OpenCV 4.6.0 is diff --git a/modules/vision/test/keypoint-with-dataset/testKeyPoint-7.cpp b/modules/vision/test/keypoint-with-dataset/testKeyPoint-7.cpp index 253dd7ebad..b66df93f4d 100644 --- a/modules/vision/test/keypoint-with-dataset/testKeyPoint-7.cpp +++ b/modules/vision/test/keypoint-with-dataset/testKeyPoint-7.cpp @@ -441,12 +441,13 @@ template void run_test(const std::string &env_ipath, const std:: } // Test with floating point descriptor -#if defined(VISP_HAVE_OPENCV_NONFREE) || \ - ((VISP_HAVE_OPENCV_VERSION >= 0x030000) && defined(VISP_HAVE_OPENCV_XFEATURES2D) || \ +#if defined(VISP_HAVE_OPENCV_NONFREE) || \ + ((VISP_HAVE_OPENCV_VERSION >= 0x030000) && defined(VISP_HAVE_OPENCV_XFEATURES2D) || \ (VISP_HAVE_OPENCV_VERSION >= 0x030411 && CV_MAJOR_VERSION < 4) || (VISP_HAVE_OPENCV_VERSION >= 0x040400)) { -#if (VISP_HAVE_OPENCV_VERSION != 0x040504) && (VISP_HAVE_OPENCV_VERSION != 0x040505) && \ - (VISP_HAVE_OPENCV_VERSION != 0x040600) && (VISP_HAVE_OPENCV_VERSION != 0x040700) && \ +#if (VISP_HAVE_OPENCV_VERSION != 0x040504) && (VISP_HAVE_OPENCV_VERSION != 0x040505) && \ + (VISP_HAVE_OPENCV_VERSION != 0x040600) && (VISP_HAVE_OPENCV_VERSION != 0x040700) && \ + (VISP_HAVE_OPENCV_VERSION != 0x040900) && \ (defined(__APPLE__) && defined(__MACH__)) // SIFT is known to be unstable with OpenCV 4.5.4 and 4.5.5 on macOS (see #1048) // Same for OpenCV 4.6.0 (see #1106) where it produces an Illegal Instruction error when OpenCV 4.6.0 is