Skip to content

Commit

Permalink
Merge pull request #1065 from asmorkalov:pre_4.11
Browse files Browse the repository at this point in the history 
Submodules update to 4.11.0-pre
  • Loading branch information
@asmorkalov
asmorkalov authored Dec 31, 2024
2 parents 6b45caa + ae90ee7 commit 43c1105
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels_macos_m1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
Build:
runs-on: python-macos11-m1
runs-on: python-macos12-m1
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion opencv
Submodule opencv updated 122 files
2 changes: 1 addition & 1 deletion opencv_contrib
Submodule opencv_contrib updated 67 files
+2 −0 modules/cudalegacy/include/opencv2/cudalegacy.hpp
+3 −3 modules/cudalegacy/include/opencv2/cudalegacy/private.hpp
+3 −0 modules/cudalegacy/src/NCV.cpp
+0 −2 modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu
+2 −2 modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu
+2 −2 modules/cudalegacy/src/cuda/NCVPixelOperations.hpp
+15 −17 modules/cudalegacy/src/cuda/NPP_staging.cu
+3 −3 modules/cudalegacy/src/cuda/needle_map.cu
+2 −0 modules/cudalegacy/src/precomp.hpp
+1 −2 modules/fastcv/README.md
+8 −1 modules/fastcv/include/opencv2/fastcv.hpp
+2 −1 modules/fastcv/include/opencv2/fastcv/arithm.hpp
+64 −0 modules/fastcv/include/opencv2/fastcv/blur.hpp
+2 −1 modules/fastcv/include/opencv2/fastcv/cluster.hpp
+1 −1 modules/fastcv/include/opencv2/fastcv/draw.hpp
+53 −0 modules/fastcv/include/opencv2/fastcv/edges.hpp
+4 −3 modules/fastcv/include/opencv2/fastcv/fast10.hpp
+1 −1 modules/fastcv/include/opencv2/fastcv/fft.hpp
+29 −0 modules/fastcv/include/opencv2/fastcv/histogram.hpp
+1 −1 modules/fastcv/include/opencv2/fastcv/hough.hpp
+39 −0 modules/fastcv/include/opencv2/fastcv/ipptransform.hpp
+5 −3 modules/fastcv/include/opencv2/fastcv/moments.hpp
+86 −95 modules/fastcv/include/opencv2/fastcv/mser.hpp
+51 −0 modules/fastcv/include/opencv2/fastcv/pyramid.hpp
+2 −0 modules/fastcv/include/opencv2/fastcv/scale.hpp
+5 −2 modules/fastcv/include/opencv2/fastcv/shift.hpp
+1 −0 modules/fastcv/include/opencv2/fastcv/smooth.hpp
+2 −2 modules/fastcv/include/opencv2/fastcv/thresh.hpp
+66 −0 modules/fastcv/include/opencv2/fastcv/tracking.hpp
+38 −0 modules/fastcv/include/opencv2/fastcv/warp.hpp
+12 −11 modules/fastcv/perf/perf_bilateral.cpp
+123 −0 modules/fastcv/perf/perf_blur.cpp
+68 −0 modules/fastcv/perf/perf_edges.cpp
+104 −0 modules/fastcv/perf/perf_fft_dct.cpp
+36 −0 modules/fastcv/perf/perf_histogram.cpp
+11 −10 modules/fastcv/perf/perf_mser.cpp
+76 −0 modules/fastcv/perf/perf_pyramid.cpp
+98 −0 modules/fastcv/perf/perf_tracking.cpp
+62 −0 modules/fastcv/perf/perf_warp.cpp
+47 −59 modules/fastcv/src/bilateralFilter.cpp
+365 −0 modules/fastcv/src/blur.cpp
+125 −0 modules/fastcv/src/edges.cpp
+74 −0 modules/fastcv/src/histogram.cpp
+48 −0 modules/fastcv/src/ipptransform.cpp
+36 −44 modules/fastcv/src/moments.cpp
+104 −46 modules/fastcv/src/mser.cpp
+3 −0 modules/fastcv/src/precomp.hpp
+183 −0 modules/fastcv/src/pyramid.cpp
+10 −10 modules/fastcv/src/remap.cpp
+6 −1 modules/fastcv/src/thresh.cpp
+269 −0 modules/fastcv/src/tracking.cpp
+76 −0 modules/fastcv/src/warp.cpp
+8 −8 modules/fastcv/test/test_bilateral.cpp
+129 −0 modules/fastcv/test/test_blur.cpp
+74 −0 modules/fastcv/test/test_edges.cpp
+0 −1 modules/fastcv/test/test_fft.cpp
+80 −0 modules/fastcv/test/test_ipptransform.cpp
+25 −19 modules/fastcv/test/test_moments.cpp
+11 −11 modules/fastcv/test/test_mser.cpp
+1 −0 modules/fastcv/test/test_precomp.hpp
+171 −0 modules/fastcv/test/test_pyramid.cpp
+3 −12 modules/fastcv/test/test_remap.cpp
+9 −18 modules/fastcv/test/test_scale.cpp
+9 −2 modules/fastcv/test/test_smooth.cpp
+142 −0 modules/fastcv/test/test_tracking.cpp
+70 −0 modules/fastcv/test/test_warp.cpp
+8 −3 modules/text/src/erfilter.cpp
2 changes: 1 addition & 1 deletion opencv_extra
Submodule opencv_extra updated 95 files
+1 −17 testdata/dnn/download_models.py
+ − testdata/fastcv/bilateral/rec_0.010000_1.000000.png
+ − testdata/fastcv/bilateral/rec_0.100000_0.010000.png
+ − testdata/fastcv/bilateral/rec_1.000000_0.010000.png
+ − testdata/fastcv/bilateral/rec_1.000000_1.000000.png
+ − testdata/fastcv/bilateral/rec_5.000000_0.010000.png
+ − testdata/fastcv/bilateral/rec_5.000000_0.100000.png
+ − testdata/fastcv/bilateral/rec_5.000000_5.000000.png
+ − testdata/highgui/gifsuite/basi3p01.gif
+ − testdata/highgui/gifsuite/basi3p02.gif
+ − testdata/highgui/gifsuite/basi3p04.gif
+ − testdata/highgui/gifsuite/basn3p01.gif
+ − testdata/highgui/gifsuite/basn3p02.gif
+ − testdata/highgui/gifsuite/basn3p04.gif
+ − testdata/highgui/gifsuite/ccwn3p08.gif
+ − testdata/highgui/gifsuite/cdfn2c08.gif
+ − testdata/highgui/gifsuite/cdhn2c08.gif
+ − testdata/highgui/gifsuite/cdsn2c08.gif
+ − testdata/highgui/gifsuite/cdun2c08.gif
+ − testdata/highgui/gifsuite/ch1n3p04.gif
+ − testdata/highgui/gifsuite/cs3n3p08.gif
+ − testdata/highgui/gifsuite/cs5n2c08.gif
+ − testdata/highgui/gifsuite/cs5n3p08.gif
+ − testdata/highgui/gifsuite/cs8n2c08.gif
+ − testdata/highgui/gifsuite/cs8n3p08.gif
+ − testdata/highgui/gifsuite/exif2c08.gif
+ − testdata/highgui/gifsuite/g03n2c08.gif
+ − testdata/highgui/gifsuite/g03n3p04.gif
+ − testdata/highgui/gifsuite/g04n2c08.gif
+ − testdata/highgui/gifsuite/g04n3p04.gif
+ − testdata/highgui/gifsuite/g05n2c08.gif
+ − testdata/highgui/gifsuite/g05n3p04.gif
+ − testdata/highgui/gifsuite/g07n2c08.gif
+ − testdata/highgui/gifsuite/g07n3p04.gif
+ − testdata/highgui/gifsuite/g10n2c08.gif
+ − testdata/highgui/gifsuite/g10n3p04.gif
+ − testdata/highgui/gifsuite/g25n2c08.gif
+ − testdata/highgui/gifsuite/g25n3p04.gif
+ − testdata/highgui/gifsuite/gif_bgra1.gif
+ − testdata/highgui/gifsuite/gif_bgra1.png
+ − testdata/highgui/gifsuite/gif_bgra2.gif
+ − testdata/highgui/gifsuite/gif_bgra2.png
+ − testdata/highgui/gifsuite/gif_bgra3.gif
+ − testdata/highgui/gifsuite/gif_bgra3.png
+ − testdata/highgui/gifsuite/gif_bgra4.gif
+ − testdata/highgui/gifsuite/gif_bgra4.png
+ − testdata/highgui/gifsuite/gif_bgra5.gif
+ − testdata/highgui/gifsuite/gif_bgra5.png
+ − testdata/highgui/gifsuite/gif_bgra6.gif
+ − testdata/highgui/gifsuite/gif_bgra6.png
+ − testdata/highgui/gifsuite/gif_big.gif
+ − testdata/highgui/gifsuite/gif_big.png
+ − testdata/highgui/gifsuite/gif_multi.gif
+ − testdata/highgui/gifsuite/gif_multi_bgra.gif
+ − testdata/highgui/gifsuite/s01i3p01.gif
+ − testdata/highgui/gifsuite/s01n3p01.gif
+ − testdata/highgui/gifsuite/s02i3p01.gif
+ − testdata/highgui/gifsuite/s02n3p01.gif
+ − testdata/highgui/gifsuite/s03i3p01.gif
+ − testdata/highgui/gifsuite/s03n3p01.gif
+ − testdata/highgui/gifsuite/s04i3p01.gif
+ − testdata/highgui/gifsuite/s04n3p01.gif
+ − testdata/highgui/gifsuite/s05i3p02.gif
+ − testdata/highgui/gifsuite/s05n3p02.gif
+ − testdata/highgui/gifsuite/s06i3p02.gif
+ − testdata/highgui/gifsuite/s06n3p02.gif
+ − testdata/highgui/gifsuite/s07i3p02.gif
+ − testdata/highgui/gifsuite/s07n3p02.gif
+ − testdata/highgui/gifsuite/s08i3p02.gif
+ − testdata/highgui/gifsuite/s08n3p02.gif
+ − testdata/highgui/gifsuite/s09i3p02.gif
+ − testdata/highgui/gifsuite/s09n3p02.gif
+ − testdata/highgui/gifsuite/s32i3p04.gif
+ − testdata/highgui/gifsuite/s32n3p04.gif
+ − testdata/highgui/gifsuite/s33i3p04.gif
+ − testdata/highgui/gifsuite/s33n3p04.gif
+ − testdata/highgui/gifsuite/s34i3p04.gif
+ − testdata/highgui/gifsuite/s34n3p04.gif
+ − testdata/highgui/gifsuite/s35i3p04.gif
+ − testdata/highgui/gifsuite/s35n3p04.gif
+ − testdata/highgui/gifsuite/s36i3p04.gif
+ − testdata/highgui/gifsuite/s36n3p04.gif
+ − testdata/highgui/gifsuite/s37i3p04.gif
+ − testdata/highgui/gifsuite/s37n3p04.gif
+ − testdata/highgui/gifsuite/s38i3p04.gif
+ − testdata/highgui/gifsuite/s38n3p04.gif
+ − testdata/highgui/gifsuite/s39i3p04.gif
+ − testdata/highgui/gifsuite/s39n3p04.gif
+ − testdata/highgui/gifsuite/s40i3p04.gif
+ − testdata/highgui/gifsuite/s40n3p04.gif
+ − testdata/highgui/gifsuite/special1.gif
+ − testdata/highgui/gifsuite/special1.png
+ − testdata/highgui/gifsuite/special2.gif
+ − testdata/highgui/gifsuite/special2.png
+ − testdata/highgui/gifsuite/tp0n3p08.gif
6 changes: 0 additions & 6 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ def main():
else []
)
+
(
[r"lib/libOrbbecSDK.dylib", r"lib/libOrbbecSDK.\d.\d.dylib", r"lib/libOrbbecSDK.\d.\d.\d.dylib"]
if platform.system() == "Darwin" and platform.machine() == "arm64"
else []
)
+
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
# Naming conventions vary so widely between versions and OSes
# had to give up on checking them.
Expand Down

0 comments on commit 43c1105

Please sign in to comment.