opencv · May 12, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025
Showing with 14 additions and 18 deletions.

+8 −5 .github/workflows/build_wheels_windows.yml

+1 −1 multibuild

+1 −1 opencv

+1 −1 opencv_contrib

+1 −1 opencv_extra

+2 −9 setup.py
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   Build:
-    runs-on: windows-2019
+    runs-on: windows-2025
     strategy:
       fail-fast: false
       matrix:
@@ -48,7 +48,7 @@ jobs:
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
         fetch-depth: 0
@@ -61,16 +61,18 @@ jobs:
       uses: microsoft/setup-msbuild@v1.1
     - name: Setup NASM
       uses: ilammy/setup-nasm@v1
+
     - name: Build a package
       # CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version
       run: |
         python --version
         python -m pip install --upgrade pip
         python -m pip install --upgrade setuptools
-        python -m pip install cmake==3.24.2
+        python -m pip install cmake
         python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
         set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v
       shell: cmd
+
     - name: Saving all wheels
       uses: actions/upload-artifact@v4
       with:
@@ -79,7 +81,7 @@ jobs:
 
   Test:
     needs: [Build]
-    runs-on: windows-2019
+    runs-on: windows-2025
     defaults:
       run:
         shell: cmd
@@ -103,10 +105,11 @@ jobs:
         rm -rf ./.??* || true
       working-directory: ${{ github.workspace }}
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true
         fetch-depth: 0
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

diff --git a/multibuild b/multibuild
diff --git a/opencv b/opencv
diff --git a/opencv_contrib b/opencv_contrib
diff --git a/opencv_extra b/opencv_extra
diff --git a/setup.py b/setup.py
@@ -161,16 +161,9 @@ def main():
     # Files in sourcetree outside package dir that should be copied to package.
     # Raw paths relative to sourcetree root.
     files_outside_package_dir = {"cv2": ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]}
-
-    ci_cmake_generator = (
-        ["-G", "Visual Studio 14" + (" Win64" if is64 else "")]
-        if os.name == "nt"
-        else ["-G", "Unix Makefiles"]
-    )
-
+
     cmake_args = (
-        (ci_cmake_generator if is_CI_build else [])
-        + [
+         [
             # skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
             "-DPYTHON3_EXECUTABLE=%s" % sys.executable,
             "-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,
+0 −91		.appveyor.yml
+5 −11		.github/workflows/lint_python.yml
+19 −10		.github/workflows/test.yml
+4 −0		.gitignore
+1 −1		LICENSE
+8 −8		README.rst
+17 −9		common_utils.sh
+41 −42		library_builders.sh
+40 −23		osx_utils.sh
+16 −12		supported_wheels.py
+11 −0		tests/patches/harfbuzz-2.7.4.tar.xz.patch
+1 −2		tests/test_common_utils.sh
+3 −1		tests/test_fill_pyver.sh
+1 −1		tests/test_fill_submodule.sh
+4 −0		tests/test_library_builders.sh
+0 −2		tests/test_multibuild.sh
+33 −9		tests/test_osx_utils.sh
+1 −11		tests/test_python_install.sh
+3 −3		tests/test_supported_wheels.sh
+1 −1		travis_linux_steps.sh
+7 −8		.github/workflows/PR-4.x.yaml
+1 −1		modules/aruco/include/opencv2/aruco/aruco_calib.hpp
+2 −2		modules/bgsegm/tutorials/bgsegm_bg_subtraction/bgsegm_bg_subtraction.markdown
+0 −1		modules/cnn_3dobj/include/opencv2/cnn_3dobj.hpp
+2 −1		modules/cudacodec/include/opencv2/cudacodec.hpp
+4 −4		modules/cudacodec/src/NvEncoder.cpp
+24 −11		modules/cudacodec/src/video_writer.cpp
+5 −13		modules/cudacodec/test/test_video.cpp
+28 −12		modules/cudaimgproc/src/color.cpp
+32 −16		modules/cudaimgproc/src/cuda/debayer.cu
+1 −1		modules/cudalegacy/include/opencv2/cudalegacy/private.hpp
+9 −2		modules/cudev/test/CMakeLists.txt
+0 −1		modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp
+1 −1		modules/dpm/src/dpm_cascade.cpp
+1 −1		modules/dpm/src/dpm_feature.cpp
+0 −1		modules/dpm/src/dpm_feature.hpp
+9 −1		modules/fastcv/include/opencv2/fastcv.hpp
+64 −0		modules/fastcv/include/opencv2/fastcv/allocator.hpp
+58 −1		modules/fastcv/include/opencv2/fastcv/arithm.hpp
+17 −1		modules/fastcv/include/opencv2/fastcv/blur.hpp
+33 −0		modules/fastcv/include/opencv2/fastcv/blur_dsp.hpp
+45 −0		modules/fastcv/include/opencv2/fastcv/channel.hpp
+49 −0		modules/fastcv/include/opencv2/fastcv/dsp_init.hpp
+38 −0		modules/fastcv/include/opencv2/fastcv/edges_dsp.hpp
+49 −0		modules/fastcv/include/opencv2/fastcv/fft_dsp.hpp
+2 −2		modules/fastcv/include/opencv2/fastcv/pyramid.hpp
+34 −0		modules/fastcv/include/opencv2/fastcv/sad_dsp.hpp
+13 −15		modules/fastcv/include/opencv2/fastcv/scale.hpp
+39 −0		modules/fastcv/include/opencv2/fastcv/thresh_dsp.hpp
+11 −12		modules/fastcv/include/opencv2/fastcv/tracking.hpp
+55 −1		modules/fastcv/include/opencv2/fastcv/warp.hpp
+32 −0		modules/fastcv/perf/perf_arithm.cpp
+26 −1		modules/fastcv/perf/perf_blur.cpp
+73 −0		modules/fastcv/perf/perf_blur_dsp.cpp
+56 −0		modules/fastcv/perf/perf_edges_dsp.cpp
+85 −0		modules/fastcv/perf/perf_fft_dsp.cpp
+2 −2		modules/fastcv/perf/perf_hough.cpp
+6 −1		modules/fastcv/perf/perf_main.cpp
+34 −1		modules/fastcv/perf/perf_matmul.cpp
+2 −0		modules/fastcv/perf/perf_precomp.hpp
+52 −0		modules/fastcv/perf/perf_sad_dsp.cpp
+66 −0		modules/fastcv/perf/perf_scale.cpp
+52 −0		modules/fastcv/perf/perf_thresh_dsp.cpp
+196 −22		modules/fastcv/perf/perf_warp.cpp
+105 −0		modules/fastcv/src/allocator.cpp
+173 −1		modules/fastcv/src/arithm.cpp
+22 −1		modules/fastcv/src/blur.cpp
+68 −0		modules/fastcv/src/blur_dsp.cpp
+143 −0		modules/fastcv/src/channel.cpp
+46 −0		modules/fastcv/src/dsp_init.cpp
+63 −0		modules/fastcv/src/edges_dsp.cpp
+96 −0		modules/fastcv/src/fft_dsp.cpp
+110 −2		modules/fastcv/src/precomp.hpp
+46 −0		modules/fastcv/src/sad_dsp.cpp
+48 −35		modules/fastcv/src/scale.cpp
+55 −0		modules/fastcv/src/thresh_dsp.cpp
+280 −36		modules/fastcv/src/warp.cpp
+70 −1		modules/fastcv/test/test_arithm.cpp
+22 −1		modules/fastcv/test/test_blur.cpp
+75 −0		modules/fastcv/test/test_blur_dsp.cpp
+72 −0		modules/fastcv/test/test_channel.cpp
+39 −0		modules/fastcv/test/test_edges_dsp.cpp
+98 −0		modules/fastcv/test/test_fft_dsp.cpp
+6 −1		modules/fastcv/test/test_main.cpp
+3 −3		modules/fastcv/test/test_mser.cpp
+2 −0		modules/fastcv/test/test_precomp.hpp
+6 −5		modules/fastcv/test/test_pyramid.cpp
+44 −0		modules/fastcv/test/test_sad_dsp.cpp
+27 −44		modules/fastcv/test/test_scale.cpp
+92 −0		modules/fastcv/test/test_thresh_dsp.cpp
+167 −27		modules/fastcv/test/test_warp.cpp
+0 −1		modules/img_hash/src/precomp.hpp
+4 −0		modules/matlab/CMakeLists.txt
+8 −2		modules/matlab/generator/parse_tree.py
+30 −2		modules/matlab/include/opencv2/matlab/bridge.hpp
+3 −0		modules/mcc/src/bound_min.cpp
+12 −19		modules/mcc/src/checker_detector.cpp
+2 −1		modules/mcc/src/checker_detector.hpp
+0 −1		modules/xfeatures2d/src/affine_feature2d.cpp
+0 −1		modules/xphoto/samples/dct_image_denoising.cpp
+4 −6		modules/xphoto/src/dct_image_denoising.cpp
+ −		testdata/cv/cvtcolor/bayerVNG_gold.png
+ −		testdata/cv/cvtcolor_strict/bglena.png
+ −		testdata/cv/cvtcolor_strict/gblena.png
+ −		testdata/cv/cvtcolor_strict/grlena.png
+ −		testdata/cv/cvtcolor_strict/rglena.png
+83 −0		testdata/cv/fast/result_no_nonmax.xml
+256 −256		testdata/cv/hdr/calibrate/debevec.csv
+2,686 −2,637		testdata/cv/hdr/merge/debevec.hdr
+2 −2		testdata/cv/io/3_4/Core_InputOutput--filestorage_base64_basic_rw_JSON.json
+35 −35		testdata/cv/io/3_4/Core_InputOutput--filestorage_base64_basic_rw_XML.xml
+35 −35		testdata/cv/io/3_4/Core_InputOutput--filestorage_base64_basic_rw_YAML.yml
+2 −2		testdata/cv/io/Core_InputOutput--filestorage_base64_basic_read_JSON.json
+35 −35		testdata/cv/io/Core_InputOutput--filestorage_base64_basic_read_XML.xml
+35 −35		testdata/cv/io/Core_InputOutput--filestorage_base64_basic_read_YAML.yml
+5 −0		testdata/dnn/download_models.py
+ −		testdata/dnn/tflite/face_blendshapes_inp.npy
+ −		testdata/dnn/tflite/face_blendshapes_out_StatefulPartitionedCall_0.npy
+30 −5		testdata/dnn/tflite/generate.py
+ −		testdata/dnn/tflite/strided_slice.tflite
+ −		testdata/dnn/tflite/strided_slice_inp.npy
+ −		testdata/dnn/tflite/strided_slice_out_Identity.npy
+ −		testdata/highgui/gifsuite/disposalMethod.gif
+ −		testdata/highgui/readwrite/033.png
+ −		testdata/highgui/readwrite/034.png
+ −		testdata/highgui/readwrite/035.png
+3,684 −0		testdata/perf/core.xml
+57,478 −57,638		testdata/perf/imgproc.xml