zishuo/opencv-mobile
1
0
Fork 0
mirror of https://github.com/nihui/opencv-mobile.git synced 2025-10-30 03:21:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

drawing mono font, ci matrix release, source package (#76)

Browse Source
This commit is contained in:
nihui
2023-12-10 20:45:28 +08:00
committed by GitHub
parent fc01eab943
commit dd6063730d
32 changed files with 6219 additions and 3993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/opencv-4.8.1-no-atomic.patch Normal file
View File

@@ -0,0 +1,36 @@
diff -Nuarp opencv-4.8.0.orig/modules/core/src/mathfuncs.cpp opencv-4.8.0/modules/core/src/mathfuncs.cpp
--- opencv-4.8.0.orig/modules/core/src/mathfuncs.cpp 2023-06-28 19:53:33.000000000 +0800
+++ opencv-4.8.0/modules/core/src/mathfuncs.cpp 2023-09-24 13:59:28.427872811 +0800
@@ -2133,8 +2133,13 @@ const double* getExpTab64f()
const float* getExpTab32f()
{
static float CV_DECL_ALIGNED(64) expTab_f[EXPTAB_MASK+1];
+#ifndef OPENCV_DISABLE_THREAD_SUPPORT
static std::atomic<bool> expTab_f_initialized(false);
if (!expTab_f_initialized.load())
+#else
+ static bool expTab_f_initialized = false;
+ if (!expTab_f_initialized)
+#endif
{
for( int j = 0; j <= EXPTAB_MASK; j++ )
expTab_f[j] = (float)expTab[j];
diff -Nuarp opencv-4.8.0.orig/modules/core/src/parallel.cpp opencv-4.8.0/modules/core/src/parallel.cpp
--- opencv-4.8.0.orig/modules/core/src/parallel.cpp 2023-06-28 19:53:33.000000000 +0800
+++ opencv-4.8.0/modules/core/src/parallel.cpp 2023-09-24 13:59:09.334964234 +0800
@@ -513,6 +513,7 @@ void parallel_for_(const cv::Range& rang
if (range.empty())
return;
+#ifndef OPENCV_DISABLE_THREAD_SUPPORT
static std::atomic<bool> flagNestedParallelFor(false);
bool isNotNestedRegion = !flagNestedParallelFor.load();
if (isNotNestedRegion)
@@ -531,6 +532,7 @@ void parallel_for_(const cv::Range& rang
}
}
else // nested parallel_for_() calls are not parallelized
+#endif
{
CV_UNUSED(nstripes);
body(range);