Skip to content

Commit 589a38a

Browse files
nihuinihui
authored
update opencv 4.11.0 (#181)
* save kleidicv
1 parent 312edb7 commit 589a38a

13 files changed

+503
-403
lines changed

‎.github/workflows/release.yml

+70-34
Large diffs are not rendered by default.

‎README.md

+67-57
Large diffs are not rendered by default.

‎fix-windows-sdk-26100-arm64-wchar.patch

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- "Windows Kits/10/Include/10.0.26100.0/ucrt/wchar.h" 2025-03-21 11:30:49.000000000 +0000
2+
+++ "Windows Kits/10/Include/10.0.26100.0/ucrt/wchar.h" 2025-03-21 11:40:35.766780259 +0000
3+
@@ -228,7 +228,7 @@ typedef wchar_t _Wint_t;
4+
unsigned long Index = 0;
5+
wchar_t const* S = _S;
6+
7+
- #if defined(_M_ARM64) || defined(_M_ARM64EC) || defined(_M_HYBRID_X86_ARM64)
8+
+ #if 0//defined(_M_ARM64) || defined(_M_ARM64EC) || defined(_M_HYBRID_X86_ARM64)
9+
if (_N >= 4)
10+
{
11+
uint16x8_t V2 = vdupq_n_u16(_C);
12+
@@ -352,7 +352,7 @@ typedef wchar_t _Wint_t;
13+
wchar_t const* S1 = _S1;
14+
wchar_t const* S2 = _S2;
15+
16+
- #if defined(_M_ARM64) || defined(_M_ARM64EC) || defined(_M_HYBRID_X86_ARM64)
17+
+ #if 0//defined(_M_ARM64) || defined(_M_ARM64EC) || defined(_M_HYBRID_X86_ARM64)
18+
19+
while (Count + 8 <= _N)
20+
{

‎patches/opencv-4.10.0-no-zlib.patch

-12
This file was deleted.

‎patches/opencv-4.10.0-drawing-mono-font.patch renamed to ‎patches/opencv-4.11.0-drawing-mono-font.patch

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -Nuarp opencv-4.10.0.orig/modules/imgproc/include/opencv2/imgproc.hpp opencv-4.10.0/modules/imgproc/include/opencv2/imgproc.hpp
2-
--- opencv-4.10.0.orig/modules/imgproc/include/opencv2/imgproc.hpp 2024-08-03 13:16:17.646944880 +0800
3-
+++ opencv-4.10.0/modules/imgproc/include/opencv2/imgproc.hpp 2024-08-01 23:08:51.014584430 +0800
4-
@@ -4898,6 +4898,37 @@ CV_EXPORTS_W double getFontScaleFromHeig
1+
diff -Nuarp opencv-4.11.0.orig/modules/imgproc/include/opencv2/imgproc.hpp opencv-4.11.0/modules/imgproc/include/opencv2/imgproc.hpp
2+
--- opencv-4.11.0.orig/modules/imgproc/include/opencv2/imgproc.hpp 2025-01-19 00:07:25.706895750 +0800
3+
+++ opencv-4.11.0/modules/imgproc/include/opencv2/imgproc.hpp 2025-01-19 00:19:27.955301521 +0800
4+
@@ -4929,6 +4929,37 @@ CV_EXPORTS_W double getFontScaleFromHeig
55
const int pixelHeight,
66
const int thickness = 1);
77

@@ -39,9 +39,9 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/include/opencv2/imgproc.hpp openc
3939
/** @brief Class for iterating over all pixels on a raster line segment.
4040

4141
The class LineIterator is used to get each pixel of a raster line connecting
42-
diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/modules/imgproc/src/drawing.cpp
43-
--- opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp 2024-08-03 13:16:17.650944867 +0800
44-
+++ opencv-4.10.0/modules/imgproc/src/drawing.cpp 2024-08-01 23:09:27.473433279 +0800
42+
diff -Nuarp opencv-4.11.0.orig/modules/imgproc/src/drawing.cpp opencv-4.11.0/modules/imgproc/src/drawing.cpp
43+
--- opencv-4.11.0.orig/modules/imgproc/src/drawing.cpp 2025-01-19 00:07:25.768896509 +0800
44+
+++ opencv-4.11.0/modules/imgproc/src/drawing.cpp 2025-01-19 00:24:39.379680129 +0800
4545
@@ -43,6 +43,25 @@ using namespace cv;
4646

4747
namespace cv
@@ -65,26 +65,26 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
6565
+
6666
+namespace cv
6767
+{
68-
6968
enum { XY_SHIFT = 16, XY_ONE = 1 << XY_SHIFT, DRAWING_STORAGE_BLOCK = (1<<12) - 256 };
7069

71-
@@ -2076,6 +2095,7 @@ void polylines( InputOutputArray _img, c
70+
static const int MAX_THICKNESS = 32767;
71+
@@ -2069,6 +2088,7 @@ void polylines( InputOutputArray _img, c
7272
}
7373

7474

7575
+#if 0
7676
enum { FONT_SIZE_SHIFT=8, FONT_ITALIC_ALPHA=(1 << 8),
7777
FONT_ITALIC_DIGIT=(2 << 8), FONT_ITALIC_PUNCT=(4 << 8),
7878
FONT_ITALIC_BRACES=(8 << 8), FONT_HAVE_GREEK=(16 << 8),
79-
@@ -2290,6 +2310,7 @@ inline void readCheck(int &c, int &i, co
79+
@@ -2283,6 +2303,7 @@ inline void readCheck(int &c, int &i, co
8080
}
8181

8282
extern const char* g_HersheyGlyphs[];
8383
+#endif
8484

8585
void putText( InputOutputArray _img, const String& text, Point org,
8686
int fontFace, double fontScale, Scalar color,
87-
@@ -2303,6 +2324,35 @@ void putText( InputOutputArray _img, con
87+
@@ -2296,6 +2317,35 @@ void putText( InputOutputArray _img, con
8888
return;
8989
}
9090
Mat img = _img.getMat();
@@ -120,7 +120,7 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
120120
const int* ascii = getFontData(fontFace);
121121

122122
double buf[4];
123-
@@ -2357,10 +2407,21 @@ void putText( InputOutputArray _img, con
123+
@@ -2350,10 +2400,21 @@ void putText( InputOutputArray _img, con
124124
}
125125
view_x += dx;
126126
}
@@ -142,7 +142,7 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
142142
Size size;
143143
double view_x = 0;
144144
const char **faces = cv::g_HersheyGlyphs;
145-
@@ -2387,10 +2448,13 @@ Size getTextSize( const String& text, in
145+
@@ -2380,10 +2441,13 @@ Size getTextSize( const String& text, in
146146
if( _base_line )
147147
*_base_line = cvRound(base_line*fontScale + thickness*0.5);
148148
return size;
@@ -156,7 +156,7 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
156156
// By https://stackoverflow.com/a/27898487/1531708
157157
const int* ascii = getFontData(fontFace);
158158

159-
@@ -2398,6 +2462,96 @@ double getFontScaleFromHeight(const int
159+
@@ -2391,6 +2455,96 @@ double getFontScaleFromHeight(const int
160160
int cap_line = (ascii[0] >> 4) & 15;
161161

162162
return static_cast<double>(pixelHeight - static_cast<double>((thickness + 1)) / 2.0) / static_cast<double>(cap_line + base_line);
@@ -253,7 +253,7 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
253253
}
254254

255255
}
256-
@@ -2883,7 +3037,7 @@ cvInitFont( CvFont *font, int font_face,
256+
@@ -2870,7 +3024,7 @@ cvInitFont( CvFont *font, int font_face,
257257
{
258258
CV_Assert( font != 0 && hscale > 0 && vscale > 0 && thickness >= 0 );
259259

@@ -262,9 +262,9 @@ diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/drawing.cpp opencv-4.10.0/mod
262262
font->font_face = font_face;
263263
font->hscale = (float)hscale;
264264
font->vscale = (float)vscale;
265-
diff -Nuarp opencv-4.10.0.orig/modules/imgproc/src/hershey_fonts.cpp opencv-4.10.0/modules/imgproc/src/hershey_fonts.cpp
266-
--- opencv-4.10.0.orig/modules/imgproc/src/hershey_fonts.cpp 2024-08-03 13:16:17.651944863 +0800
267-
+++ opencv-4.10.0/modules/imgproc/src/hershey_fonts.cpp 2024-08-03 13:16:57.200812630 +0800
265+
diff -Nuarp opencv-4.11.0.orig/modules/imgproc/src/hershey_fonts.cpp opencv-4.11.0/modules/imgproc/src/hershey_fonts.cpp
266+
--- opencv-4.11.0.orig/modules/imgproc/src/hershey_fonts.cpp 2025-01-19 00:07:25.781896668 +0800
267+
+++ opencv-4.11.0/modules/imgproc/src/hershey_fonts.cpp 2025-01-19 00:19:27.956301532 +0800
268268
@@ -51,6 +51,7 @@
269269
namespace cv
270270
{

‎patches/opencv-4.10.0-fix-windows-arm-arch.patch renamed to ‎patches/opencv-4.11.0-fix-windows-arm-arch.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-4.10.0/cmake/OpenCVDetectCXXCompiler.cmake
2-
--- opencv-4.10.0.orig/cmake/OpenCVDetectCXXCompiler.cmake 2024-06-02 19:41:07.000000000 +0800
3-
+++ opencv-4.10.0/cmake/OpenCVDetectCXXCompiler.cmake 2024-06-10 14:58:22.061466618 +0800
4-
@@ -150,9 +150,9 @@ elseif(MSVC)
1+
diff -Nuarp opencv-4.11.0.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-4.11.0/cmake/OpenCVDetectCXXCompiler.cmake
2+
--- opencv-4.11.0.orig/cmake/OpenCVDetectCXXCompiler.cmake 2025-01-18 23:31:52.784608127 +0800
3+
+++ opencv-4.11.0/cmake/OpenCVDetectCXXCompiler.cmake 2025-01-18 23:48:03.298849297 +0800
4+
@@ -154,9 +154,9 @@ elseif(MSVC)
55
# see Modules/CMakeGenericSystem.cmake
66
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
77
set(OpenCV_ARCH "x64")
@@ -13,9 +13,9 @@ diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-4.10.0
1313
set(OpenCV_ARCH "ARM")
1414
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
1515
set(OpenCV_ARCH "x64")
16-
diff -Nuarp opencv-4.10.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in opencv-4.10.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
17-
--- opencv-4.10.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2024-06-02 19:41:07.000000000 +0800
18-
+++ opencv-4.10.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2024-06-10 14:58:43.470327117 +0800
16+
diff -Nuarp opencv-4.11.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in opencv-4.11.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
17+
--- opencv-4.11.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2025-01-18 23:31:52.785608139 +0800
18+
+++ opencv-4.11.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2025-01-18 23:48:03.298849297 +0800
1919
@@ -99,9 +99,9 @@ elseif(MSVC)
2020
# see Modules/CMakeGenericSystem.cmake
2121
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")

‎patches/opencv-4.10.0-link-openmp.patch renamed to ‎patches/opencv-4.11.0-link-openmp.patch

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVGenConfig.cmake opencv-4.10.0/cmake/OpenCVGenConfig.cmake
2-
--- opencv-4.10.0.orig/cmake/OpenCVGenConfig.cmake 2024-06-02 04:41:06.000000000 +0800
3-
+++ opencv-4.10.0/cmake/OpenCVGenConfig.cmake 2024-06-04 21:00:46.778862221 +0800
1+
diff -Nuarp opencv-4.11.0.orig/cmake/OpenCVGenConfig.cmake opencv-4.11.0/cmake/OpenCVGenConfig.cmake
2+
--- opencv-4.11.0.orig/cmake/OpenCVGenConfig.cmake 2025-01-18 23:31:52.784608127 +0800
3+
+++ opencv-4.11.0/cmake/OpenCVGenConfig.cmake 2025-01-18 23:46:35.410724844 +0800
44
@@ -19,6 +19,10 @@ if(HAVE_CUDA)
55
endif()
66
endif()
@@ -12,9 +12,9 @@ diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVGenConfig.cmake opencv-4.10.0/cmake/O
1212
if(ANDROID)
1313
if(NOT ANDROID_NATIVE_API_LEVEL)
1414
set(OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE 0)
15-
diff -Nuarp opencv-4.10.0.orig/cmake/templates/OpenCVConfig.cmake.in opencv-4.10.0/cmake/templates/OpenCVConfig.cmake.in
16-
--- opencv-4.10.0.orig/cmake/templates/OpenCVConfig.cmake.in 2024-06-02 04:41:06.000000000 +0800
17-
+++ opencv-4.10.0/cmake/templates/OpenCVConfig.cmake.in 2024-06-04 21:01:05.274804136 +0800
15+
diff -Nuarp opencv-4.11.0.orig/cmake/templates/OpenCVConfig.cmake.in opencv-4.11.0/cmake/templates/OpenCVConfig.cmake.in
16+
--- opencv-4.11.0.orig/cmake/templates/OpenCVConfig.cmake.in 2025-01-18 23:31:52.785608139 +0800
17+
+++ opencv-4.11.0/cmake/templates/OpenCVConfig.cmake.in 2025-01-18 23:46:35.410724844 +0800
1818
@@ -94,6 +94,7 @@ endif()
1919

2020

@@ -23,19 +23,19 @@ diff -Nuarp opencv-4.10.0.orig/cmake/templates/OpenCVConfig.cmake.in opencv-4.10
2323
@ANDROID_CONFIGCMAKE@
2424

2525
@IPPICV_CONFIGCMAKE@
26-
diff -Nuarp opencv-4.10.0.orig/cmake/templates/OpenCVConfig-OPENMP.cmake.in opencv-4.10.0/cmake/templates/OpenCVConfig-OPENMP.cmake.in
27-
--- opencv-4.10.0.orig/cmake/templates/OpenCVConfig-OPENMP.cmake.in 1970-01-01 08:00:00.000000000 +0800
28-
+++ opencv-4.10.0/cmake/templates/OpenCVConfig-OPENMP.cmake.in 2024-06-04 21:01:34.441712541 +0800
26+
diff -Nuarp opencv-4.11.0.orig/cmake/templates/OpenCVConfig-OPENMP.cmake.in opencv-4.11.0/cmake/templates/OpenCVConfig-OPENMP.cmake.in
27+
--- opencv-4.11.0.orig/cmake/templates/OpenCVConfig-OPENMP.cmake.in 1970-01-01 08:00:00.000000000 +0800
28+
+++ opencv-4.11.0/cmake/templates/OpenCVConfig-OPENMP.cmake.in 2025-01-18 23:46:35.410724844 +0800
2929
@@ -0,0 +1,5 @@
3030
+set(OpenCV_USE_OPENMP "@HAVE_OPENMP@")
3131
+
3232
+if(OpenCV_USE_OPENMP)
3333
+ find_package(OpenMP)
3434
+endif()
35-
diff -Nuarp opencv-4.10.0.orig/modules/core/CMakeLists.txt opencv-4.10.0/modules/core/CMakeLists.txt
36-
--- opencv-4.10.0.orig/modules/core/CMakeLists.txt 2024-06-02 04:41:06.000000000 +0800
37-
+++ opencv-4.10.0/modules/core/CMakeLists.txt 2024-06-04 20:59:13.030307438 +0800
38-
@@ -190,8 +190,14 @@ if(HAVE_HPX)
35+
diff -Nuarp opencv-4.11.0.orig/modules/core/CMakeLists.txt opencv-4.11.0/modules/core/CMakeLists.txt
36+
--- opencv-4.11.0.orig/modules/core/CMakeLists.txt 2025-01-18 23:31:52.823608595 +0800
37+
+++ opencv-4.11.0/modules/core/CMakeLists.txt 2025-01-18 23:46:35.410724844 +0800
38+
@@ -198,8 +198,14 @@ if(HAVE_HPX)
3939
ocv_target_link_libraries(${the_module} LINK_PRIVATE "${HPX_LIBRARIES}")
4040
endif()
4141

@@ -52,9 +52,9 @@ diff -Nuarp opencv-4.10.0.orig/modules/core/CMakeLists.txt opencv-4.10.0/modules
5252
endif()
5353

5454
ocv_add_accuracy_tests()
55-
diff -Nuarp opencv-4.10.0.orig/modules/video/CMakeLists.txt opencv-4.10.0/modules/video/CMakeLists.txt
56-
--- opencv-4.10.0.orig/modules/video/CMakeLists.txt 2024-06-02 04:41:06.000000000 +0800
57-
+++ opencv-4.10.0/modules/video/CMakeLists.txt 2024-06-04 20:59:36.412174358 +0800
55+
diff -Nuarp opencv-4.11.0.orig/modules/video/CMakeLists.txt opencv-4.11.0/modules/video/CMakeLists.txt
56+
--- opencv-4.11.0.orig/modules/video/CMakeLists.txt 2025-01-18 23:31:52.852608943 +0800
57+
+++ opencv-4.11.0/modules/video/CMakeLists.txt 2025-01-18 23:46:35.410724844 +0800
5858
@@ -10,7 +10,3 @@ ocv_define_module(video
5959
python
6060
js

‎patches/opencv-4.10.0-minimal-install.patch renamed to ‎patches/opencv-4.11.0-minimal-install.patch

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVGenAndroidMK.cmake opencv-4.10.0/cmake/OpenCVGenAndroidMK.cmake
2-
--- opencv-4.10.0.orig/cmake/OpenCVGenAndroidMK.cmake 2024-06-02 04:41:06.000000000 +0800
3-
+++ opencv-4.10.0/cmake/OpenCVGenAndroidMK.cmake 2024-06-04 21:02:30.323531599 +0800
1+
diff -Nuarp opencv-4.11.0.orig/cmake/OpenCVGenAndroidMK.cmake opencv-4.11.0/cmake/OpenCVGenAndroidMK.cmake
2+
--- opencv-4.11.0.orig/cmake/OpenCVGenAndroidMK.cmake 2025-01-18 23:31:52.784608127 +0800
3+
+++ opencv-4.11.0/cmake/OpenCVGenAndroidMK.cmake 2025-01-18 23:49:42.727186205 +0800
44
@@ -76,6 +76,4 @@ if(ANDROID)
55

66
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" @ONLY)
77
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV-abi.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk" @ONLY)
88
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
99
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
1010
endif(ANDROID)
11-
diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVUtils.cmake opencv-4.10.0/cmake/OpenCVUtils.cmake
12-
--- opencv-4.10.0.orig/cmake/OpenCVUtils.cmake 2024-06-02 04:41:06.000000000 +0800
13-
+++ opencv-4.10.0/cmake/OpenCVUtils.cmake 2024-06-04 21:02:50.020458607 +0800
14-
@@ -976,11 +976,6 @@ macro(ocv_finalize_status)
11+
diff -Nuarp opencv-4.11.0.orig/cmake/OpenCVUtils.cmake opencv-4.11.0/cmake/OpenCVUtils.cmake
12+
--- opencv-4.11.0.orig/cmake/OpenCVUtils.cmake 2025-01-18 23:31:52.785608139 +0800
13+
+++ opencv-4.11.0/cmake/OpenCVUtils.cmake 2025-01-18 23:49:42.727186205 +0800
14+
@@ -980,11 +980,6 @@ macro(ocv_finalize_status)
1515
endif()
1616
endif()
1717

@@ -23,10 +23,10 @@ diff -Nuarp opencv-4.10.0.orig/cmake/OpenCVUtils.cmake opencv-4.10.0/cmake/OpenC
2323
endmacro()
2424

2525

26-
diff -Nuarp opencv-4.10.0.orig/CMakeLists.txt opencv-4.10.0/CMakeLists.txt
27-
--- opencv-4.10.0.orig/CMakeLists.txt 2024-06-02 04:41:06.000000000 +0800
28-
+++ opencv-4.10.0/CMakeLists.txt 2024-06-04 21:03:59.252202053 +0800
29-
@@ -1076,20 +1076,12 @@ ocv_add_modules_compiler_options()
26+
diff -Nuarp opencv-4.11.0.orig/CMakeLists.txt opencv-4.11.0/CMakeLists.txt
27+
--- opencv-4.11.0.orig/CMakeLists.txt 2025-01-18 23:31:52.783608115 +0800
28+
+++ opencv-4.11.0/CMakeLists.txt 2025-01-18 23:49:42.727186205 +0800
29+
@@ -1068,20 +1068,12 @@ ocv_add_modules_compiler_options()
3030
ocv_register_modules()
3131

3232
# Generate targets for documentation
@@ -47,7 +47,7 @@ diff -Nuarp opencv-4.10.0.orig/CMakeLists.txt opencv-4.10.0/CMakeLists.txt
4747

4848
# ----------------------------------------------------------------------------
4949
# Finalization: generate configuration-based files
50-
@@ -1101,20 +1093,13 @@ ocv_cmake_hook(PRE_FINALIZE)
50+
@@ -1093,20 +1085,13 @@ ocv_cmake_hook(PRE_FINALIZE)
5151
include(cmake/OpenCVGenHeaders.cmake)
5252

5353
# Generate opencv.pc for pkg-config command
@@ -68,7 +68,7 @@ diff -Nuarp opencv-4.10.0.orig/CMakeLists.txt opencv-4.10.0/CMakeLists.txt
6868

6969
# Generate ABI descriptor
7070
include(cmake/OpenCVGenABI.cmake)
71-
@@ -1140,12 +1125,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PA
71+
@@ -1132,12 +1117,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PA
7272
endif()
7373
endif()
7474

@@ -81,7 +81,7 @@ diff -Nuarp opencv-4.10.0.orig/CMakeLists.txt opencv-4.10.0/CMakeLists.txt
8181
if(NOT OPENCV_LICENSE_FILE)
8282
set(OPENCV_LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE)
8383
endif()
84-
@@ -1155,11 +1134,6 @@ if(ANDROID OR NOT UNIX)
84+
@@ -1147,11 +1126,6 @@ if(ANDROID OR NOT UNIX)
8585
install(FILES ${OPENCV_LICENSE_FILE}
8686
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
8787
DESTINATION ./ COMPONENT libs)
@@ -93,9 +93,9 @@ diff -Nuarp opencv-4.10.0.orig/CMakeLists.txt opencv-4.10.0/CMakeLists.txt
9393
endif()
9494

9595
if(COMMAND ocv_pylint_finalize)
96-
diff -Nuarp opencv-4.10.0.orig/data/CMakeLists.txt opencv-4.10.0/data/CMakeLists.txt
97-
--- opencv-4.10.0.orig/data/CMakeLists.txt 2024-06-02 04:41:06.000000000 +0800
98-
+++ opencv-4.10.0/data/CMakeLists.txt 2024-06-04 21:04:10.806159236 +0800
96+
diff -Nuarp opencv-4.11.0.orig/data/CMakeLists.txt opencv-4.11.0/data/CMakeLists.txt
97+
--- opencv-4.11.0.orig/data/CMakeLists.txt 2025-01-18 23:31:52.786608151 +0800
98+
+++ opencv-4.11.0/data/CMakeLists.txt 2025-01-18 23:49:42.727186205 +0800
9999
@@ -1,9 +1,6 @@
100100
file(GLOB HAAR_CASCADES haarcascades/*.xml)
101101
file(GLOB LBP_CASCADES lbpcascades/*.xml)

‎patches/opencv-4.10.0-no-atomic.patch renamed to ‎patches/opencv-4.11.0-no-atomic.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -Nuarp opencv-4.10.0.orig/modules/core/src/mathfuncs.cpp opencv-4.10.0/modules/core/src/mathfuncs.cpp
2-
--- opencv-4.10.0.orig/modules/core/src/mathfuncs.cpp 2024-06-02 04:41:06.000000000 +0800
3-
+++ opencv-4.10.0/modules/core/src/mathfuncs.cpp 2024-06-04 20:57:06.217205470 +0800
4-
@@ -2187,8 +2187,13 @@ const double* getExpTab64f()
1+
diff -Nuarp opencv-4.11.0.orig/modules/core/src/mathfuncs.cpp opencv-4.11.0/modules/core/src/mathfuncs.cpp
2+
--- opencv-4.11.0.orig/modules/core/src/mathfuncs.cpp 2025-01-18 23:31:52.827608643 +0800
3+
+++ opencv-4.11.0/modules/core/src/mathfuncs.cpp 2025-01-18 23:55:21.143734178 +0800
4+
@@ -2170,8 +2170,13 @@ const double* getExpTab64f()
55
const float* getExpTab32f()
66
{
77
static float CV_DECL_ALIGNED(64) expTab_f[EXPTAB_MASK+1];
@@ -15,18 +15,18 @@ diff -Nuarp opencv-4.10.0.orig/modules/core/src/mathfuncs.cpp opencv-4.10.0/modu
1515
{
1616
for( int j = 0; j <= EXPTAB_MASK; j++ )
1717
expTab_f[j] = (float)expTab[j];
18-
diff -Nuarp opencv-4.10.0.orig/modules/core/src/parallel.cpp opencv-4.10.0/modules/core/src/parallel.cpp
19-
--- opencv-4.10.0.orig/modules/core/src/parallel.cpp 2024-06-02 04:41:06.000000000 +0800
20-
+++ opencv-4.10.0/modules/core/src/parallel.cpp 2024-06-04 20:57:58.179745974 +0800
21-
@@ -513,6 +513,7 @@ void parallel_for_(const cv::Range& rang
18+
diff -Nuarp opencv-4.11.0.orig/modules/core/src/parallel.cpp opencv-4.11.0/modules/core/src/parallel.cpp
19+
--- opencv-4.11.0.orig/modules/core/src/parallel.cpp 2025-01-18 23:43:48.356574419 +0800
20+
+++ opencv-4.11.0/modules/core/src/parallel.cpp 2025-01-18 23:55:21.143734178 +0800
21+
@@ -497,6 +497,7 @@ void parallel_for_(const cv::Range& rang
2222
if (range.empty())
2323
return;
2424

2525
+#ifndef OPENCV_DISABLE_THREAD_SUPPORT
2626
static std::atomic<bool> flagNestedParallelFor(false);
2727
bool isNotNestedRegion = !flagNestedParallelFor.load();
2828
if (isNotNestedRegion)
29-
@@ -531,6 +532,7 @@ void parallel_for_(const cv::Range& rang
29+
@@ -509,6 +510,7 @@ void parallel_for_(const cv::Range& rang
3030
}
3131
}
3232
else // nested parallel_for_() calls are not parallelized

0 commit comments

Comments
 (0)