diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-03-30 06:27:20 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-03-30 06:27:20 +0000 |
| commit | de0ae6784abfd457306070c6a071f88eb3e3debd (patch) | |
| tree | e173b883cbeecfb7f7e63f2a6f1a106d1fbd89a8 /Repair_clang_abi.patch | |
| parent | 7b7652e716157e0054871c904f060749b76853cd (diff) | |
automatic import of opencv
Diffstat (limited to 'Repair_clang_abi.patch')
| -rw-r--r-- | Repair_clang_abi.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/Repair_clang_abi.patch b/Repair_clang_abi.patch new file mode 100644 index 0000000..e05dd08 --- /dev/null +++ b/Repair_clang_abi.patch @@ -0,0 +1,39 @@ +diff -Npur opencv-4.5.2/modules/core/include/opencv2/core/types.hpp opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp +--- opencv-4.5.2/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:30:22.631203192 +0800 ++++ opencv-4.5.2-new/modules/core/include/opencv2/core/types.hpp 2021-11-17 10:34:53.117761924 +0800 +@@ -162,7 +162,7 @@ public: + //! default constructor + Point_(); + Point_(_Tp _x, _Tp _y); +-#if (defined(__GNUC__) && __GNUC__ < 5) ++#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) + Point_(const Point_& pt); + Point_(Point_&& pt) CV_NOEXCEPT = default; + #elif OPENCV_ABI_COMPATIBILITY < 500 +@@ -172,7 +172,7 @@ public: + Point_(const Size_<_Tp>& sz); + Point_(const Vec<_Tp, 2>& v); + +-#if (defined(__GNUC__) && __GNUC__ < 5) ++#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) + Point_& operator = (const Point_& pt); + Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; + #elif OPENCV_ABI_COMPATIBILITY < 500 +@@ -1186,7 +1186,7 @@ template<typename _Tp> inline + Point_<_Tp>::Point_(_Tp _x, _Tp _y) + : x(_x), y(_y) {} + +-#if (defined(__GNUC__) && __GNUC__ < 5) ++#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) + template<typename _Tp> inline + Point_<_Tp>::Point_(const Point_& pt) + : x(pt.x), y(pt.y) {} +@@ -1208,7 +1208,7 @@ template<typename _Tp> inline + Point_<_Tp>::Point_(const Vec<_Tp,2>& v) + : x(v[0]), y(v[1]) {} + +-#if (defined(__GNUC__) && __GNUC__ < 5) ++#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) + template<typename _Tp> inline + Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) + { |