update 3.4.20 and 4.8.0 and some ci fix and highgui fix (#53)

* update 3.4.20 patch

* update 4.8.0 patch

* update toolchain and ci

* split ios simulator

* fix wasm simd build

* enable cxx11 for opencv2

* workaround for macos build

* workaround for ios build

* do not convert RGB/BGR inplace on imencode/imwrite

* Update stb_image.h

* enable stbi neon

* Update highgui.cpp

* mac catalyst

* add test project

* opencv2 link openmp

* opencv 2.4.13.7 on newer msvc

* enable c++11 test

* test all packages
This commit is contained in:
nihui
2023-08-14 15:41:28 +08:00
committed by GitHub
parent 1b825e7721
commit fc1635bba6
21 changed files with 3484 additions and 1298 deletions

View File

@@ -0,0 +1,16 @@
diff -Nuarp opencv-2.4.13.7.orig/modules/core/CMakeLists.txt opencv-2.4.13.7/modules/core/CMakeLists.txt
--- opencv-2.4.13.7.orig/modules/core/CMakeLists.txt 2018-07-02 20:41:56.000000000 +0800
+++ opencv-2.4.13.7/modules/core/CMakeLists.txt 2023-08-13 19:26:51.073833956 +0800
@@ -52,7 +52,11 @@ else()
HEADERS ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
endif()
-ocv_create_module()
+if(HAVE_OPENMP AND DEFINED OpenMP_CXX_LIBRARIES AND OpenMP_CXX_LIBRARIES)
+ ocv_create_module(${OpenMP_CXX_LIBRARIES})
+else()
+ ocv_create_module()
+endif()
ocv_add_precompiled_headers(${the_module})
ocv_add_accuracy_tests()