5.x merge 4.x #4036
Merged
5.x merge 4.x #4036
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Update documentation for cv::cuda::createMedianFilter
[Saliency] Enable Java/Android bindings by adding 'WRAP java' to CMake opencv#4018 Fixes opencv#4016 This addresses the inability to use the `saliency` module in Android (Java/Kotlin) applications. When generated using `build_sdk.py`, the native library compiles, but the Java wrapper class (`org.opencv.saliency.Saliency`) is not generated. # Technical Fix: The `ocv_define_module` macro in `modules/saliency/CMakeLists.txt` was missing the `java` flag in its `WRAP` parameter. **Change in `modules/saliency/CMakeLists.txt`:** **OLD** ocv_define_module(saliency opencv_imgproc opencv_features2d WRAP python) **NEW** ocv_define_module(saliency opencv_imgproc opencv_features2d WRAP python java) ### 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 - [ ] 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
Add detail to cv::cuda::gammaCorrection docs
Fix clahe build ### Pull Request Readiness Checklist Fix the build related to this [PR](opencv/opencv#28014). This inherits from CLAHE, so the `setBitShift` and `getBitShift` functions need to be defined. Error this fixes: ``` error: invalid new-expression of abstract class type '{anonymous}::CLAHE_Impl' opencv/contrib/modules/cudaimgproc/src/histogram.cpp:150:11: note: because the following virtual functions are pure within '{anonymous}::CLAHE_Impl': class CLAHE_Impl : public cv::cuda::CLAHE In file included from opencv_contrib/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp:51 opencv/modules/imgproc/include/opencv2/imgproc.hpp:1074:26: note: 'virtual void cv::CLAHE::setBitShift(int)' CV_WRAP virtual void setBitShift(int bitShift) = 0; opencv/modules/imgproc/include/opencv2/imgproc.hpp:1080:25: note: 'virtual int cv::CLAHE::getBitShift() const' CV_WRAP virtual int getBitShift() const = 0; ``` This change was tested on Ubuntu 24.04 with the latest updates from the opencv and opencv_contrib repositories. This resulted in the build being successful. - [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 force-pushed the 5.x-merge-4.x branch from 3a72729 to 85e30a0 Compare Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
OpenCV: opencv/opencv#28027
OpenCV Extra: opencv/opencv_extra#1291
#4018 from Akhil-Chaturvedi:patch-1
#4023 from srcejon:createMedianFilter_docs
#4034 from srcejon:cuda_gammaCorrection_docs
Previous "Merge 4.x": #4032