From 377e856803925eca689fd27e63da986f6284f7ca Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 24 Jun 2022 10:11:08 +0200 Subject: [PATCH 1/5] Fix file ending --- .../aruco_board_detection.markdown | 2 +- .../images/{board.jpg => board.png} | Bin .../charuco_detection/charuco_detection.markdown | 2 +- .../images/{charucoboard.jpg => charucoboard.png} | Bin ...oof.jpg => checkershadow_illusion4med_proof.png} | Bin .../retina_illusion/retina_illusion.markdown | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) rename modules/aruco/tutorials/aruco_board_detection/images/{board.jpg => board.png} (100%) rename modules/aruco/tutorials/charuco_detection/images/{charucoboard.jpg => charucoboard.png} (100%) rename modules/bioinspired/tutorials/retina_illusion/images/{checkershadow_illusion4med_proof.jpg => checkershadow_illusion4med_proof.png} (100%) diff --git a/modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown b/modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown index 95d3a3dc3..6ce8603ec 100644 --- a/modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown +++ b/modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown @@ -156,7 +156,7 @@ In this case the margin is 10. The output image will be something like this: -![](images/board.jpg) +![](images/board.png) A full working example of board creation is included in the `create_board.cpp` inside the `modules/aruco/samples/`. diff --git a/modules/aruco/tutorials/aruco_board_detection/images/board.jpg b/modules/aruco/tutorials/aruco_board_detection/images/board.png similarity index 100% rename from modules/aruco/tutorials/aruco_board_detection/images/board.jpg rename to modules/aruco/tutorials/aruco_board_detection/images/board.png diff --git a/modules/aruco/tutorials/charuco_detection/charuco_detection.markdown b/modules/aruco/tutorials/charuco_detection/charuco_detection.markdown index 3ed729db9..ddcd5e91b 100644 --- a/modules/aruco/tutorials/charuco_detection/charuco_detection.markdown +++ b/modules/aruco/tutorials/charuco_detection/charuco_detection.markdown @@ -88,7 +88,7 @@ In this case the margin is 10. The output image will be something like this: -![](images/charucoboard.jpg) +![](images/charucoboard.png) A full working example is included in the `create_board_charuco.cpp` inside the `modules/aruco/samples/`. diff --git a/modules/aruco/tutorials/charuco_detection/images/charucoboard.jpg b/modules/aruco/tutorials/charuco_detection/images/charucoboard.png similarity index 100% rename from modules/aruco/tutorials/charuco_detection/images/charucoboard.jpg rename to modules/aruco/tutorials/charuco_detection/images/charucoboard.png diff --git a/modules/bioinspired/tutorials/retina_illusion/images/checkershadow_illusion4med_proof.jpg b/modules/bioinspired/tutorials/retina_illusion/images/checkershadow_illusion4med_proof.png similarity index 100% rename from modules/bioinspired/tutorials/retina_illusion/images/checkershadow_illusion4med_proof.jpg rename to modules/bioinspired/tutorials/retina_illusion/images/checkershadow_illusion4med_proof.png diff --git a/modules/bioinspired/tutorials/retina_illusion/retina_illusion.markdown b/modules/bioinspired/tutorials/retina_illusion/retina_illusion.markdown index 847321e54..024879e02 100644 --- a/modules/bioinspired/tutorials/retina_illusion/retina_illusion.markdown +++ b/modules/bioinspired/tutorials/retina_illusion/retina_illusion.markdown @@ -30,7 +30,7 @@ values of the two squares with the picker tool. In this image I've cropped a little piece of the A and B squares and I've put them side-by-side. It should be quite evident they have the same luminance. -![Adelson checkerboard proof](images/checkershadow_illusion4med_proof.jpg) +![Adelson checkerboard proof](images/checkershadow_illusion4med_proof.png) It's worth to know that this illusion works because the checkerboard image, as you may see it on your laptop, casts on your retina with dimensions that cause the retina local adaptation to take @@ -184,4 +184,4 @@ opportunity of writing this tutorial, and for reviewing it. **Edward Adelson** - for allowing me to freely use his checkerboard image. -**Antonio Cuni** - for reviewing this tutorial and for writing the Python code. \ No newline at end of file +**Antonio Cuni** - for reviewing this tutorial and for writing the Python code. From a96a930f1241f3e3a2de477cda22cf30da1f9759 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Wed, 6 Jul 2022 23:27:45 +0900 Subject: [PATCH 2/5] suppress warning on GCC 7 and later --- modules/aruco/CMakeLists.txt | 4 ++++ modules/ccalib/CMakeLists.txt | 4 ++++ modules/datasets/CMakeLists.txt | 4 ++++ modules/dnn_objdetect/CMakeLists.txt | 5 ++++- modules/dpm/CMakeLists.txt | 4 ++++ modules/face/CMakeLists.txt | 4 ++++ modules/line_descriptor/CMakeLists.txt | 4 ++++ modules/optflow/CMakeLists.txt | 4 ++++ modules/rgbd/CMakeLists.txt | 4 ++++ modules/text/CMakeLists.txt | 4 ++++ modules/tracking/CMakeLists.txt | 4 ++++ modules/xfeatures2d/CMakeLists.txt | 4 ++++ modules/ximgproc/CMakeLists.txt | 4 ++++ modules/xobjdetect/CMakeLists.txt | 4 ++++ modules/xphoto/CMakeLists.txt | 4 ++++ 15 files changed, 60 insertions(+), 1 deletion(-) diff --git a/modules/aruco/CMakeLists.txt b/modules/aruco/CMakeLists.txt index 12467e88f..17f1da666 100644 --- a/modules/aruco/CMakeLists.txt +++ b/modules/aruco/CMakeLists.txt @@ -1,4 +1,8 @@ set(the_description "ArUco Marker Detection") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java) ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt index f803322ba..446e7f433 100644 --- a/modules/ccalib/CMakeLists.txt +++ b/modules/ccalib/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "Custom Calibration Pattern") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python) diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt index 56ca9e310..97606bb40 100644 --- a/modules/datasets/CMakeLists.txt +++ b/modules/datasets/CMakeLists.txt @@ -13,3 +13,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267 # flann, Win64 -Wimplicit-fallthrough # tinyxml2.cpp ) +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() diff --git a/modules/dnn_objdetect/CMakeLists.txt b/modules/dnn_objdetect/CMakeLists.txt index 895bffbed..c6aa4540b 100644 --- a/modules/dnn_objdetect/CMakeLists.txt +++ b/modules/dnn_objdetect/CMakeLists.txt @@ -1,5 +1,8 @@ set(the_description "Object Detection using CNNs") - +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(dnn_objdetect opencv_core opencv_imgproc opencv_dnn OPTIONAL opencv_highgui opencv_imgcodecs # samples ) diff --git a/modules/dpm/CMakeLists.txt b/modules/dpm/CMakeLists.txt index 4d6a302b7..090f90366 100644 --- a/modules/dpm/CMakeLists.txt +++ b/modules/dpm/CMakeLists.txt @@ -3,3 +3,7 @@ set(the_description "Object Detection") ocv_define_module(dpm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # disable warning on Win64 +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() diff --git a/modules/face/CMakeLists.txt b/modules/face/CMakeLists.txt index 2d5f8075a..f7e5374d6 100644 --- a/modules/face/CMakeLists.txt +++ b/modules/face/CMakeLists.txt @@ -1,4 +1,8 @@ set(the_description "Face recognition etc") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(face opencv_core opencv_imgproc opencv_objdetect diff --git a/modules/line_descriptor/CMakeLists.txt b/modules/line_descriptor/CMakeLists.txt index 0c18edf7d..fc3b31711 100644 --- a/modules/line_descriptor/CMakeLists.txt +++ b/modules/line_descriptor/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "Line descriptor") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python) diff --git a/modules/optflow/CMakeLists.txt b/modules/optflow/CMakeLists.txt index 39a37f143..beee73384 100644 --- a/modules/optflow/CMakeLists.txt +++ b/modules/optflow/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "Optical Flow Algorithms") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python) diff --git a/modules/rgbd/CMakeLists.txt b/modules/rgbd/CMakeLists.txt index f2e022fe8..643be62c7 100644 --- a/modules/rgbd/CMakeLists.txt +++ b/modules/rgbd/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "RGBD algorithms") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(rgbd opencv_core opencv_calib3d opencv_imgproc WRAP python) diff --git a/modules/text/CMakeLists.txt b/modules/text/CMakeLists.txt index 82e1e2a7e..36caffb5d 100644 --- a/modules/text/CMakeLists.txt +++ b/modules/text/CMakeLists.txt @@ -3,6 +3,10 @@ set(__extra_deps "") if(DEBUG_opencv_text) list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui) endif() +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn diff --git a/modules/tracking/CMakeLists.txt b/modules/tracking/CMakeLists.txt index 6fa88af29..50aae65a3 100644 --- a/modules/tracking/CMakeLists.txt +++ b/modules/tracking/CMakeLists.txt @@ -1,3 +1,7 @@ set(the_description "Tracking API") ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow /wd4458) +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index bbc540e27..80b8c64ca 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -3,6 +3,10 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) endif() +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java) if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING) diff --git a/modules/ximgproc/CMakeLists.txt b/modules/ximgproc/CMakeLists.txt index f6f88bec6..b6699eeb4 100644 --- a/modules/ximgproc/CMakeLists.txt +++ b/modules/ximgproc/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "Extended image processing module. It includes edge-aware filters and etc.") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python java) diff --git a/modules/xobjdetect/CMakeLists.txt b/modules/xobjdetect/CMakeLists.txt index 1727a42b7..56b1749bb 100644 --- a/modules/xobjdetect/CMakeLists.txt +++ b/modules/xobjdetect/CMakeLists.txt @@ -1,4 +1,8 @@ set(the_description "Object detection algorithms") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_objdetect opencv_imgcodecs WRAP python) if (BUILD_opencv_apps AND NOT APPLE_FRAMEWORK) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools) diff --git a/modules/xphoto/CMakeLists.txt b/modules/xphoto/CMakeLists.txt index a05848d38..877384378 100644 --- a/modules/xphoto/CMakeLists.txt +++ b/modules/xphoto/CMakeLists.txt @@ -1,2 +1,6 @@ set(the_description "Addon to basic photo module") +if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + # suppress warnings from GCC only on 7.1 and later + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) +endif() ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java) From f4712664ea6ab44cd2cb7b87a8678b20d716bbd4 Mon Sep 17 00:00:00 2001 From: huangqinjin Date: Sat, 23 Jul 2022 21:42:04 +0800 Subject: [PATCH 3/5] ximgproc: fix mismatched new delete --- modules/ximgproc/src/edge_drawing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ximgproc/src/edge_drawing.cpp b/modules/ximgproc/src/edge_drawing.cpp index 675738643..6e6be14c3 100644 --- a/modules/ximgproc/src/edge_drawing.cpp +++ b/modules/ximgproc/src/edge_drawing.cpp @@ -5603,8 +5603,8 @@ int EdgeDrawingImpl::inverse(double** TB, double** InvB, int N) void EdgeDrawingImpl::DeallocateMatrix(double** m, int noRows) { for (int i = 0; i < noRows; i++) - delete m[i]; - delete m; + delete[] m[i]; + delete[] m; } void EdgeDrawingImpl::AperB_T(double** A_, double** B_, double** _res, int _righA, int _colA, int _righB, int _colB) From e5aa1385c3e043a8f2e31e4b290b5365d54c140d Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Wed, 27 Jul 2022 10:25:35 +0300 Subject: [PATCH 4/5] Workflow on Ubuntu 14.04 for 3.4 branch --- .github/workflows/PR-3.4.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/PR-3.4.yaml b/.github/workflows/PR-3.4.yaml index e219af7b8..bf3a80471 100644 --- a/.github/workflows/PR-3.4.yaml +++ b/.github/workflows/PR-3.4.yaml @@ -6,13 +6,16 @@ on: - 3.4 jobs: - ARM64: + Ubuntu2004-ARM64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml@main - U20: + Ubuntu1404-x64: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-3.4-U14.yaml@main + + Ubuntu2004-x64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml@main - W10: + Windows10-x64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-3.4-W10.yaml@main macOS-ARM64: From 839db443779a56559cea1b0d4418934a4aff43b0 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sun, 7 Aug 2022 15:41:00 +0300 Subject: [PATCH 5/5] Revert "suppress warning on GCC 7 and later" This reverts commit a96a930f1241f3e3a2de477cda22cf30da1f9759. --- modules/aruco/CMakeLists.txt | 4 ---- modules/ccalib/CMakeLists.txt | 4 ---- modules/datasets/CMakeLists.txt | 4 ---- modules/dnn_objdetect/CMakeLists.txt | 5 +---- modules/dpm/CMakeLists.txt | 4 ---- modules/face/CMakeLists.txt | 4 ---- modules/line_descriptor/CMakeLists.txt | 4 ---- modules/optflow/CMakeLists.txt | 4 ---- modules/rgbd/CMakeLists.txt | 4 ---- modules/text/CMakeLists.txt | 4 ---- modules/tracking/CMakeLists.txt | 4 ---- modules/xfeatures2d/CMakeLists.txt | 4 ---- modules/ximgproc/CMakeLists.txt | 4 ---- modules/xobjdetect/CMakeLists.txt | 4 ---- modules/xphoto/CMakeLists.txt | 4 ---- 15 files changed, 1 insertion(+), 60 deletions(-) diff --git a/modules/aruco/CMakeLists.txt b/modules/aruco/CMakeLists.txt index 17f1da666..12467e88f 100644 --- a/modules/aruco/CMakeLists.txt +++ b/modules/aruco/CMakeLists.txt @@ -1,8 +1,4 @@ set(the_description "ArUco Marker Detection") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java) ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt index 446e7f433..f803322ba 100644 --- a/modules/ccalib/CMakeLists.txt +++ b/modules/ccalib/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "Custom Calibration Pattern") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python) diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt index 97606bb40..56ca9e310 100644 --- a/modules/datasets/CMakeLists.txt +++ b/modules/datasets/CMakeLists.txt @@ -13,7 +13,3 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267 # flann, Win64 -Wimplicit-fallthrough # tinyxml2.cpp ) -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() diff --git a/modules/dnn_objdetect/CMakeLists.txt b/modules/dnn_objdetect/CMakeLists.txt index c6aa4540b..895bffbed 100644 --- a/modules/dnn_objdetect/CMakeLists.txt +++ b/modules/dnn_objdetect/CMakeLists.txt @@ -1,8 +1,5 @@ set(the_description "Object Detection using CNNs") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() + ocv_define_module(dnn_objdetect opencv_core opencv_imgproc opencv_dnn OPTIONAL opencv_highgui opencv_imgcodecs # samples ) diff --git a/modules/dpm/CMakeLists.txt b/modules/dpm/CMakeLists.txt index 090f90366..4d6a302b7 100644 --- a/modules/dpm/CMakeLists.txt +++ b/modules/dpm/CMakeLists.txt @@ -3,7 +3,3 @@ set(the_description "Object Detection") ocv_define_module(dpm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # disable warning on Win64 -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() diff --git a/modules/face/CMakeLists.txt b/modules/face/CMakeLists.txt index f7e5374d6..2d5f8075a 100644 --- a/modules/face/CMakeLists.txt +++ b/modules/face/CMakeLists.txt @@ -1,8 +1,4 @@ set(the_description "Face recognition etc") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(face opencv_core opencv_imgproc opencv_objdetect diff --git a/modules/line_descriptor/CMakeLists.txt b/modules/line_descriptor/CMakeLists.txt index fc3b31711..0c18edf7d 100644 --- a/modules/line_descriptor/CMakeLists.txt +++ b/modules/line_descriptor/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "Line descriptor") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python) diff --git a/modules/optflow/CMakeLists.txt b/modules/optflow/CMakeLists.txt index beee73384..39a37f143 100644 --- a/modules/optflow/CMakeLists.txt +++ b/modules/optflow/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "Optical Flow Algorithms") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python) diff --git a/modules/rgbd/CMakeLists.txt b/modules/rgbd/CMakeLists.txt index 643be62c7..f2e022fe8 100644 --- a/modules/rgbd/CMakeLists.txt +++ b/modules/rgbd/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "RGBD algorithms") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(rgbd opencv_core opencv_calib3d opencv_imgproc WRAP python) diff --git a/modules/text/CMakeLists.txt b/modules/text/CMakeLists.txt index 36caffb5d..82e1e2a7e 100644 --- a/modules/text/CMakeLists.txt +++ b/modules/text/CMakeLists.txt @@ -3,10 +3,6 @@ set(__extra_deps "") if(DEBUG_opencv_text) list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui) endif() -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(text opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn diff --git a/modules/tracking/CMakeLists.txt b/modules/tracking/CMakeLists.txt index 50aae65a3..6fa88af29 100644 --- a/modules/tracking/CMakeLists.txt +++ b/modules/tracking/CMakeLists.txt @@ -1,7 +1,3 @@ set(the_description "Tracking API") ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow /wd4458) -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index 80b8c64ca..bbc540e27 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -3,10 +3,6 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) endif() -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java) if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING) diff --git a/modules/ximgproc/CMakeLists.txt b/modules/ximgproc/CMakeLists.txt index b6699eeb4..f6f88bec6 100644 --- a/modules/ximgproc/CMakeLists.txt +++ b/modules/ximgproc/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "Extended image processing module. It includes edge-aware filters and etc.") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python java) diff --git a/modules/xobjdetect/CMakeLists.txt b/modules/xobjdetect/CMakeLists.txt index 56b1749bb..1727a42b7 100644 --- a/modules/xobjdetect/CMakeLists.txt +++ b/modules/xobjdetect/CMakeLists.txt @@ -1,8 +1,4 @@ set(the_description "Object detection algorithms") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_objdetect opencv_imgcodecs WRAP python) if (BUILD_opencv_apps AND NOT APPLE_FRAMEWORK) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools) diff --git a/modules/xphoto/CMakeLists.txt b/modules/xphoto/CMakeLists.txt index 877384378..a05848d38 100644 --- a/modules/xphoto/CMakeLists.txt +++ b/modules/xphoto/CMakeLists.txt @@ -1,6 +1,2 @@ set(the_description "Addon to basic photo module") -if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - # suppress warnings from GCC only on 7.1 and later - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi) -endif() ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java)