Skip to content

5.x merge 4.x#27370

Merged
asmorkalov merged 77 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x
Jun 11, 2025
Merged

5.x merge 4.x#27370
asmorkalov merged 77 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x

Conversation

@asmorkalov
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov commented May 27, 2025

OpenCV Extra: opencv/opencv_extra#1258

Manual fixes:

Merged PRs:

#27268 from Kumataro:fix27267
#27270 from gursimarsingh:bug_fix_unstable_crf
#27273 from dkurt:dnn_tflite_slice
#27274 from opencv-pushbot:gitee/alalek/fix_26328
#27282 from asmorkalov:as/qt_resize
#27284 from dkurt:java_video_capture_read
#27287 from asmorkalov:as/hsv_init
#27288 from ruisv:ruisv-cuda1209-npp-patch-1
#27291 from asmorkalov:as/js_charuco_corners
#27293 from shirriff:patch-1
#27296 from sturkmen72:bugfix-gif
#27297 from Kumataro:fix27295
#27299 from amd:fast_medianblur_simd
#27300 from asmorkalov:as/license_update
#27301 from fengyuentau:4x/hal/riscv_rvv/refactor_build
#27302 from asmorkalov:as/openjpeg_status
#27305 from chengolivia:add-check-sgbm-nondeterminism
#27307 from dkurt:tflite_face_blendshape_model
#27309 from abhishek-gola:bilateral_filter_bug_fix
#27311 from asmorkalov:as/draw_axes_warning
#27314 from parona-source:fix-libspng-pkgconfig
#27315 from fengyuentau:4x/hal/riscv-rvv/refactor_functab_elemsize
#27317 from asmorkalov:as/disable_ipp_x86_android
#27321 from vrabaud:norm
#27322 from vrabaud:zeros
#27325 from VadimLevin/dev:vlevin/header-parser-conditional-inclusion-directives-handling
#27326 from dkurt:handle_multi_output_eltwise_fusion
#27327 from mshabunin:fix-intrin-legacy-ops
#27331 from MaximSmolskiy:add-test-for-solveCubic
#27332 from fengyuentau:4x/hal/riscv_rvv/calcHist
#27334 from fengyuentau:4x/imgproc/compareHist_chisqr_simd
#27337 from fengyuentau:4x/build/riscv/fix_warnings
#27338 from omahs:patch-1
#27340 from asmorkalov:apreetam_5thPost
#27341 from dkurt:vit_ov_test
#27342 from MaximSmolskiy:fix-bug-in-solvePoly-test
#27343 from fengyuentau:4x/build/fix_more_warnings
#27344 from asmorkalov:as/kleidicv_no_cv_namespace
#27345 from asmorkalov:as/android_sdk_fastcv
#27346 from asmorkalov:as/ipp_hal_sum
#27347 from MaximSmolskiy:improve-solveCubic-accuracy
#27348 from fengyuentau:4x/hal/riscv_rvv/faster_div_f32
#27351 from mshabunin:fix-intrin-legacy-ops-2
#27353 from MRo47:fix/segfault-on-forward#27352
#27356 from asmorkalov:as/ipp_hal_copyright
#27363 from MRo47:openvino-npu-support
#27367 from CodeLinaro:xuezha_markdown

Previous "Merge 4.x": #27265

Kumataro and others added 30 commits April 30, 2025 05:40
…26328

core(OCL): fix POWN OpenCL implementation
* TFLite StridedSllice (without strides but just Slice)

* Enable strides for TF importers. Update OpenVINO backend for StridedSlice
doc: hal: replace C++ operators with wrapper functions
Fixed std::vector<Point3f> handling in JS wrappers
Reworked HSV color conversion tables initialization for OpenCL branch
Fix a bug on rendering some animated gif
imgcodecs: png: add log if first chunk is not IHDR opencv#27297

Close opencv#27295

To optimize for the native pixel format of the iPhone's early PowerVR GPUs, Apple implemented a non-standard PNG format.

Details: https://theapplewiki.com/wiki/PNG_CgBI_Format

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
License update in CPack generated packages
shape has Y first, then X. See issue opencv#27292
Update match_template.py to fix doc bug
Cherry-pick OpenJPEG deconding status fix.
…actor_build

hal/riscv-rvv: refactor the building process opencv#27301

Current hal/riscv-rvv is built with all headers without building an object. This slows down the compilation progress, especially when re-compiling for minor changes in those headers (~170 files need to be re-compiled). This patch solves the problem.

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
Java VideoCapture buffered stream constructor opencv#27284

### Pull Request Readiness Checklist

resolves opencv#26809

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
…ug_fix

Fixed bilateral filter's sigma color and sigma space issue
Pkgconfig will set SPNG_LIBRARIES but not SPNG_LIBRARY, this is an issue
as modules/imgcodecs/CmakeLists.txt uses SPNG_LIBRARY.

Bug: https://bugs.gentoo.org/955661
Fixes: c928152
Signed-off-by: Alfred Wingate <parona@protonmail.com>
cmake: set SPNG_LIBRARY for pkgconfig as well
…actor_functab_elemsize

python3 "/opencv/platforms/android/build_sdk.py" --build_doc --config "/opencv/platforms/android/default.config.py" --sdk_path "$ANDROID_HOME" --ndk_path "$ANDROID_NDK_HOME" /build | tee /build/build-log.txt

python3 "/opencv/platforms/android/build_java_shared_aar.py" --offline --ndk_location="$ANDROID_NDK_HOME" --cmake_location=$(dirname $(dirname $(which cmake))) /build/OpenCV-android-sdk

hal/riscv-rvv: make use of function tab in copyToMasked and CV_ELEM_SIZE1 in place of elem_size_tab opencv#27315

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
@asmorkalov
Copy link
Copy Markdown
Contributor Author

@fengyuentau @dkurt @opencv-alalek @mshabunin Could you review the PR?

@asmorkalov asmorkalov changed the title WIP: 5.x merge 4.x 5.x merge 4.x Jun 3, 2025
Copy link
Copy Markdown
Member

@fengyuentau fengyuentau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

riscv part looks good to me 👍

@dkurt
Copy link
Copy Markdown
Member

dkurt commented Jun 9, 2025

working on Java failed test on Windows

@dkurt
Copy link
Copy Markdown
Member

dkurt commented Jun 9, 2025

@asmorkalov you may skip failed Java test on Windows for now by TestSkipException or apply #27421

asmorkalov pushed a commit that referenced this pull request Jun 10, 2025
Cover all seek directions in VideoCapture Java test #27421

### Pull Request Readiness Checklist

required for #27370

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
@asmorkalov asmorkalov requested a review from opencv-alalek June 10, 2025 11:55
@asmorkalov
Copy link
Copy Markdown
Contributor Author

@opencv-alalek @mshabunin Do you have any comments?

@asmorkalov asmorkalov merged commit 350b211 into opencv:5.x Jun 11, 2025
91 of 101 checks passed
@asmorkalov asmorkalov mentioned this pull request Jun 11, 2025
asmorkalov pushed a commit that referenced this pull request Jun 13, 2025
Adoptions of TFLife fixes to new engine #27439

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

This PR covers updates from the following PRs:
#27273, #27307 (ported to 5.x by #27370)

resolves #27397

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.