Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switched to tag 4.11.0 #1071

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Switched to tag 4.11.0 #1071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels_macos_m1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
git submodule update --init multibuild
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
export MACOSX_DEPLOYMENT_TARGET=11.0
export MACOSX_DEPLOYMENT_TARGET=13.0
python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
Expand All @@ -71,7 +71,7 @@ jobs:

Test:
needs: [Build]
runs-on: opencv-cn-mac-arm64-tests
runs-on: python-macos12-m1
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion opencv
Open in desktop
Submodule opencv updated 92 files
+0 −2 3rdparty/fastcv/CMakeLists.txt
+5 −5 3rdparty/ffmpeg/ffmpeg.cmake
+1 −1 3rdparty/hal_rvv/hal_rvv_1p0/mean.hpp
+63 −32 3rdparty/hal_rvv/hal_rvv_1p0/merge.hpp
+7 −0 CMakeLists.txt
+8 −5 cmake/OpenCVCompilerOptions.cmake
+148 −0 cmake/OpenCVFindJPEGXL.cmake
+11 −0 cmake/OpenCVFindLibsGrfmt.cmake
+9 −5 cmake/OpenCVFindLibsPerf.cmake
+12 −10 cmake/android/android_gradle_projects.cmake
+3 −0 cmake/templates/cvconfig.h.in
+5 −14 doc/opencv.bib
+2 −1 doc/py_tutorials/py_calib3d/py_pose/py_pose.markdown
+7 −1 doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown
+2 −1 doc/tutorials/introduction/config_reference/config_reference.markdown
+1 −1 modules/core/include/opencv2/core/version.hpp
+1 −2 modules/core/src/matmul.simd.hpp
+19 −4 modules/core/test/test_mat.cpp
+12 −2 modules/core/test/test_math.cpp
+15 −0 modules/dnn/src/op_cuda.cpp
+1 −7 modules/dnn/src/op_cuda.hpp
+1 −1 modules/dnn/test/test_tflite_importer.cpp
+2 −0 modules/gapi/src/streaming/gstreamer/gstreamersource.cpp
+3 −0 modules/highgui/src/window_w32.cpp
+12 −1 modules/imgcodecs/CMakeLists.txt
+9 −1 modules/imgcodecs/include/opencv2/imgcodecs.hpp
+1 −16 modules/imgcodecs/src/grfmt_avif.cpp
+0 −4 modules/imgcodecs/src/grfmt_avif.hpp
+13 −2 modules/imgcodecs/src/grfmt_base.cpp
+6 −1 modules/imgcodecs/src/grfmt_bmp.cpp
+17 −15 modules/imgcodecs/src/grfmt_gif.cpp
+1 −3 modules/imgcodecs/src/grfmt_gif.hpp
+420 −0 modules/imgcodecs/src/grfmt_jpegxl.cpp
+68 −0 modules/imgcodecs/src/grfmt_jpegxl.hpp
+1,323 −93 modules/imgcodecs/src/grfmt_png.cpp
+162 −10 modules/imgcodecs/src/grfmt_png.hpp
+0 −14 modules/imgcodecs/src/grfmt_webp.cpp
+0 −1 modules/imgcodecs/src/grfmt_webp.hpp
+1 −0 modules/imgcodecs/src/grfmts.hpp
+6 −1 modules/imgcodecs/src/loadsave.cpp
+536 −0 modules/imgcodecs/test/test_animation.cpp
+186 −0 modules/imgcodecs/test/test_jpegxl.cpp
+7 −0 modules/imgcodecs/test/test_read_write.cpp
+2 −229 modules/imgcodecs/test/test_webp.cpp
+4 −0 modules/imgproc/CMakeLists.txt
+4 −2 modules/imgproc/include/opencv2/imgproc.hpp
+3 −0 modules/imgproc/src/color.cpp
+0 −4 modules/imgproc/src/contours_new.cpp
+28 −14 modules/imgproc/src/hough.cpp
+2 −0 modules/imgproc/src/resize.cpp
+1 −1 modules/imgproc/test/test_fitellipse.cpp
+26 −126 modules/imgproc/test/test_fitellipse_ams.cpp
+26 −126 modules/imgproc/test/test_fitellipse_direct.cpp
+2 −1 modules/imgproc/test/test_histograms.cpp
+47 −0 modules/imgproc/test/test_houghlines.cpp
+5 −1 modules/java/android_sdk/CMakeLists.txt
+9 −12 modules/java/generator/android-24/java/org/opencv/android/NativeCameraView.java
+40 −0 modules/videoio/include/opencv2/videoio.hpp
+10 −0 modules/videoio/include/opencv2/videoio/registry.hpp
+31 −0 modules/videoio/include/opencv2/videoio/utils.private.hpp
+2 −1 modules/videoio/misc/objc/gen_dict.json
+110 −0 modules/videoio/misc/python/pyopencv_videoio.hpp
+66 −0 modules/videoio/misc/python/test/test_videoio.py
+5 −0 modules/videoio/src/backend.hpp
+61 −5 modules/videoio/src/backend_plugin.cpp
+33 −10 modules/videoio/src/backend_static.cpp
+138 −2 modules/videoio/src/cap.cpp
+117 −37 modules/videoio/src/cap_android_mediandk.cpp
+64 −3 modules/videoio/src/cap_ffmpeg.cpp
+90 −10 modules/videoio/src/cap_ffmpeg_impl.hpp
+3 −0 modules/videoio/src/cap_interface.hpp
+93 −12 modules/videoio/src/cap_msmf.cpp
+35 −2 modules/videoio/src/plugin_capture_api.hpp
+53 −3 modules/videoio/src/videoio_registry.cpp
+2 −0 modules/videoio/src/videoio_registry.hpp
+4 −12 modules/videoio/test/test_ffmpeg.cpp
+130 −0 modules/videoio/test/test_video_io.cpp
+1 −0 platforms/android/aar-template/OpenCV/build.gradle.template
+1 −1 platforms/android/aar-template/build.gradle
+1 −1 platforms/android/aar-template/gradle/wrapper/gradle-wrapper.properties
+14 −3 platforms/android/build_java_shared_aar.py
+16 −2 platforms/android/build_sdk.py
+6 −3 platforms/android/build_static_aar.py
+6 −0 platforms/android/default.config.py
+1 −1 samples/android/build.gradle.in
+2 −1 samples/android/tutorial-2-mixedprocessing/build.gradle.in
+8 −0 samples/android/tutorial-2-mixedprocessing/jni/CMakeLists.txt
+2 −0 samples/android/tutorial-4-opencl/build.gradle.in
+8 −0 samples/android/tutorial-4-opencl/jni/CMakeLists.txt
+16 −13 samples/android/video-recorder/src/org/opencv/samples/recorder/RecorderActivity.java
+1 −1 samples/cpp/fitellipse.cpp
+58 −11 samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp
2 changes: 1 addition & 1 deletion opencv_contrib
Open in desktop
Submodule opencv_contrib updated 16 files
+0 −3 modules/cudacodec/CMakeLists.txt
+81 −25 modules/cudacodec/include/opencv2/cudacodec.hpp
+762 −0 modules/cudacodec/src/cuda/ColorSpace.cu
+69 −0 modules/cudacodec/src/cuda/ColorSpace.h
+0 −190 modules/cudacodec/src/cuda/nv12_to_rgb.cu
+0 −167 modules/cudacodec/src/cuda/rgb_to_yv12.cu
+0 −19 modules/cudacodec/src/ffmpeg_video_source.cpp
+290 −0 modules/cudacodec/src/nvidia_surface_format_to_color_converter.cpp
+0 −1 modules/cudacodec/src/precomp.hpp
+75 −7 modules/cudacodec/src/video_decoder.cpp
+3 −1 modules/cudacodec/src/video_decoder.hpp
+1 −0 modules/cudacodec/src/video_parser.cpp
+40 −61 modules/cudacodec/src/video_reader.cpp
+8 −4 modules/cudacodec/src/video_writer.cpp
+458 −29 modules/cudacodec/test/test_video.cpp
+2 −1 modules/xfeatures2d/test/test_rotation_and_scale_invariance.cpp
Loading