4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
f38808a39f
Add Java overloads for each default argument ( #11940 )
...
* Add Java overloads for each default argument
* Add "fisheye_" prefix for cv::fisheye:: functions and enums
2018-07-17 13:41:46 +03:00
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
76c40e8f0d
java: fix copy_java_files() in gen_java.py
...
- missing 'module'
- fixed '\r\n' EOL handling (blocked by '$' regex)
2018-02-28 17:58:31 +03:00
6a8f57e5d7
Merge pull request #10081 from floe:java-camera2-view
...
* add (untested) JavaCamera2View class
* initial fixes
* minor cleanup
* exclude JavaCamera2View from build for older SDK version
* fix method name typo
* add asserts + sanity checks
* fix preview format checks
* fix the memory leak
* export cvtTwoPlaneYUVtoBGR for Java usage
* add handling for two-plane YUV frames (C wrapper still missing)
* add two-plane cvtColor helper function
* fix warnings
* actually use the new cvtColorTwoPlane helper func
* fix wrong output matrix size
* fix wrong conversion type
* simplify method signature, add error condition
* minor fixes to Mat types
* remove leftover semaphore from camera api 1
* android: JavaCamera2View minor refactoring
- re-apply Java code style
- imports cleanup
- dump exceptions information
* android: JavaCamera2View: pause/resume fixes
* android: JavaCamera2View: fix mScale
2018-02-17 15:01:24 +03:00
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
a362fd80df
java: fix bindings generator
...
- fix imports override.
Problem is observed with BoostDesc.
- add Ptr<> handling (constructor is protected from other packages).
Observed in ximgproc:
Ptr<StereoMatcher> createRightMatcher(Ptr<StereoMatcher> matcher_left)"
where, "StereoMather" is from another package (calib3d)
2018-01-13 02:12:39 +00:00
1237faef80
java: disable highgui wrapped code
2018-01-13 02:12:39 +00:00
a0d9d6db5b
fixes for old CMake (2.8.12.2)
2018-01-13 02:12:39 +00:00
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
0cad2d2a83
java: files rename
...
intermediate commit (to simplify code review)
2018-01-12 19:14:00 +00:00
c6d9ce8fd3
Merge pull request #10489 from SarenT:offset-mat_put
...
Adding capability to parse subsections of a byte array in Java bindings (#10489 )
* Adding capability to parse subsections of a byte array in Java bindings. (Because Java lacks pointers. Therefore, reading images within a subsection of a byte array is impossible by Java's nature and limitations. Because of this, many IO functions in Java require additional parameters offset and length to define, which section of an array to be read.)
* Corrected according to the review. Previous interfaces were restored, instead internal interfaces were modified to provide subsampling of java byte arrays.
* Adding tests and test related files.
* Adding missing files for the test.
* Simplified the test
* Check was corrected according to discussion. An OutOfRangeException will be thrown instead of returning.
* java: update MatOfByte implementation checks / tests
2018-01-12 18:00:58 +03:00
84596bff09
Bitwise "and false"
...
Bitwise "and false" is always false.
2018-01-07 10:12:53 +02:00
cac4a7e5b5
OpenCV version++
...
OpenCV 3.4.0-rc
2017-12-16 01:30:43 +03:00
0608227e10
Merge pull request #9698 from abratchik:parse.doxygen
...
Support @deprecated tag in java wrappers (#9698 )
2017-11-16 16:48:12 +03:00
2e772510ea
Merge pull request #10050 from floe/android-studio-3.3.1
...
Add Android Mat constructor with support for native buffer (#10050 )
2017-11-10 19:35:32 +00:00
01519313d7
dnn: invalid bindings
2017-08-31 19:35:48 +03:00
8b1146deb2
Added function to get timings for layers
2017-08-23 13:40:05 +03:00
2360291c3e
java: update source files processing, maven stuff
2017-07-19 22:39:23 +03:00
74127d44d0
More accurate condition to detect emulator
...
Previous commit, 6f39f9ahttps://stackoverflow.com/a/21505193 shows a more accurate condition for this.
2017-06-22 00:47:15 -07:00
037d8fbdcd
Refactor OpenCV Java Wrapping
2017-06-15 20:35:12 +04:00
9f0bbdada2
Merge pull request #8386 from jtkb:feature/cmake-maven-it-module
2017-05-24 10:17:03 +00:00
bf62be7f63
java: allow to wrap functions which take cv::Ptr
2017-05-02 11:50:31 +03:00
8b455e8bb3
Fixed Algorithm.save and other methods work in Java
2017-04-05 17:48:38 +03:00
d9231afa29
Changes made to the Maven build process:
...
* Introduced OSGi Blueprint XML file and Bean class too automatically load the native library.
* Introduced integration testing module to deploy to Karaf OSGi implementation.
* Clears library executable stack flag during build.
* Updated README document.
2017-03-18 10:49:02 +00:00
e685dcef0b
Fix typos
2017-03-07 23:42:24 +08:00
990e87effb
Merge pull request #8111 from utibenkei:saliency-module-java
2017-03-06 14:39:23 +00:00
92c4b6ae4c
Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters
2017-03-05 10:17:51 +00:00
ec38ef9b10
CameraBridgeViewBase synchronizes on a final field
...
Synchronizing against non-final fields is advised against.
2017-03-03 16:07:10 +01:00
6f39f9a6a0
Merge pull request #8168 from jmgomezpoveda:issue_8166
...
* Use the YV12 format in the Android emulator to avoid image issues
* Removed trailing spaces
* Added exception in else case
* Removed tab
2017-03-03 13:44:11 +00:00
11b24eb49f
Expose CirclesGridFinderParameters in findCirclesGrid.
2017-03-02 10:53:45 +01:00
6501d54267
Fix bug that occurs when module name and inherited class name are same.
2017-01-31 22:42:30 +09:00
579ffbf97e
Added Java wrapping for tracking module
2016-12-31 02:19:38 +09:00
d85c11e525
OpenCV version++
...
3.2.0-rc
2016-12-19 17:12:18 +03:00
1ae27eb696
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
2016-10-15 09:21:45 +00:00
4207ebbce7
fix for VideoCapture crash
2016-10-15 08:16:31 +04:00
699c25a4be
Merge pull request #7471 from alalek:fix_java_generator
2016-10-13 15:21:39 +00:00
084c595855
fix for legacy FeatureDetector and DescriptorMatcher classes
2016-10-13 14:45:59 +04:00
4ed40fd694
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
2016-10-12 19:54:03 +00:00
c16c803fe9
java: integrate code from base modules
...
To resolve undefined "Mat_to_vector_KeyPoint" error
2016-10-12 18:01:51 +03:00
789b35d813
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)
2016-10-11 02:47:02 +04:00
714db4cf0d
java: fix Ptr<> code generation
...
Before:
Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
2016-10-08 02:19:43 +03:00
be028d0774
fix for #7420 , #7421
2016-10-07 23:58:57 +04:00
770c69a978
fix for feature2d java wrappers as described in this post: http://ans … ( #7372 )
...
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/
* rollback of one change as requested (similar change already merged)
2016-10-06 15:48:26 +03:00
a799cc13d9
Merge pull request #6078 from PolarNick239:master
2016-10-05 17:27:23 +00:00
7a7a2749e0
Fixed java wrappers
2016-09-30 16:21:04 +03:00
1aa14e4929
fix tab for gen_java.py
2016-08-10 12:03:28 +02:00
723b42e0da
Add namespaces and proper support of the pointers
2016-08-05 15:34:57 +02:00
fc890bd941
Merge pull request #6815 from smigielski:fix_6605
2016-07-14 14:36:45 +00:00
f9ab93bf0f
Merge pull request #6876 from janstarzy:jni-as-template-redone
2016-07-11 13:06:00 +00:00
Alexander Alekhin