718c41634f
1.项目后端整体迁移至PaddleOCR-NCNN算法，已通过基本的兼容性测试 2.工程改为使用CMake组织，后续为了更好地兼容第三方库，不再提供QMake工程 3.重整权利声明文件，重整代码工程，确保最小化侵权风险 Log: 切换后端至PaddleOCR-NCNN，切换工程为CMake Change-Id: I4d5d2c5d37505a4a24b389b1a4c5d12f17bfa38c
39 lines
2.1 KiB
Diff
39 lines
2.1 KiB
Diff
diff -Nuarp opencv-4.5.4/modules/core/include/opencv2/core/cvdef.h opencv-4.5.4.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h
|
|
--- opencv-4.5.4/modules/core/include/opencv2/core/cvdef.h 2021-10-09 08:48:26.000000000 +0800
|
|
+++ opencv-4.5.4.unsafe_xadd/modules/core/include/opencv2/core/cvdef.h 2021-11-24 11:11:42.005453225 +0800
|
|
@@ -662,33 +662,7 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ (EnumTy
|
|
* exchange-add operation for atomic operations on reference counters *
|
|
\****************************************************************************************/
|
|
|
|
-#ifdef CV_XADD
|
|
- // allow to use user-defined macro
|
|
-#elif defined __GNUC__ || defined __clang__
|
|
-# if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__) && !defined __INTEL_COMPILER
|
|
-# ifdef __ATOMIC_ACQ_REL
|
|
-# define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
|
|
-# else
|
|
-# define CV_XADD(addr, delta) __atomic_fetch_add((_Atomic(int)*)(addr), delta, 4)
|
|
-# endif
|
|
-# else
|
|
-# if defined __ATOMIC_ACQ_REL && !defined __clang__
|
|
- // version for gcc >= 4.7
|
|
-# define CV_XADD(addr, delta) (int)__atomic_fetch_add((unsigned*)(addr), (unsigned)(delta), __ATOMIC_ACQ_REL)
|
|
-# else
|
|
-# define CV_XADD(addr, delta) (int)__sync_fetch_and_add((unsigned*)(addr), (unsigned)(delta))
|
|
-# endif
|
|
-# endif
|
|
-#elif defined _MSC_VER && !defined RC_INVOKED
|
|
-# include <intrin.h>
|
|
-# define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd((long volatile*)addr, delta)
|
|
-#else
|
|
- #ifdef OPENCV_FORCE_UNSAFE_XADD
|
|
- CV_INLINE int CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; }
|
|
- #else
|
|
- #error "OpenCV: can't define safe CV_XADD macro for current platform (unsupported). Define CV_XADD macro through custom port header (see OPENCV_INCLUDE_PORT_FILE)"
|
|
- #endif
|
|
-#endif
|
|
+CV_INLINE int CV_XADD(void* addr, int delta) { int tmp = *(int*)addr; *(int*)addr += delta; return tmp; }
|
|
|
|
|
|
/****************************************************************************************\
|