Alexander Alekhin
25a4559565
Merge pull request #9294 from arrybn:layers_perf
2017-08-24 09:37:49 +00:00
Aleksandr Rybnikov
8b1146deb2
Added function to get timings for layers
2017-08-23 13:40:05 +03:00
Alexander Alekhin
87a98e4562
cmake: CMP0026 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
2017-08-19 15:15:05 +00:00
John Hany
69e19b88c2
Fix SyntaxError with print
2017-08-09 21:25:16 +08:00
Alexander Alekhin
2360291c3e
java: update source files processing, maven stuff
2017-07-19 22:39:23 +03:00
abratchik
8f7181429f
add java wrappers to dnn module
2017-07-02 11:46:20 +04:00
likan999
74127d44d0
More accurate condition to detect emulator
...
Previous commit, 6f39f9a
, tries to fix the color issue for emulator. But the condition for detecting emulator is incomplete, e.g. it stops working for emulators using Google Play, whose Build.BRAND=="google". https://stackoverflow.com/a/21505193 shows a more accurate condition for this.
2017-06-22 00:47:15 -07:00
abratchik
037d8fbdcd
Refactor OpenCV Java Wrapping
2017-06-15 20:35:12 +04:00
Alexander Alekhin
59798b3f7c
java: use module's public headers only
2017-06-06 21:10:02 +03:00
Maksim Shabunin
f4e18125b4
Do not clean src and gen directories when java is disabled
2017-05-29 13:54:36 +03:00
Maksim Shabunin
9f0bbdada2
Merge pull request #8386 from jtkb:feature/cmake-maven-it-module
2017-05-24 10:17:03 +00:00
Maksim Shabunin
ea49d7b7c5
Merge pull request #8653 from alalek:android_fixes
2017-05-03 12:20:19 +00:00
Vladislav Sovrasov
bf62be7f63
java: allow to wrap functions which take cv::Ptr
2017-05-02 11:50:31 +03:00
Alexander Alekhin
133b91a026
android: build fixes
...
- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+
2017-04-26 14:24:51 +03:00
Maksim Shabunin
4d62f1de1e
Added javadoc generation
2017-04-05 18:18:39 +03:00
Maksim Shabunin
8b455e8bb3
Fixed Algorithm.save and other methods work in Java
2017-04-05 17:48:38 +03:00
Kerry Billingham
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
Maksim Shabunin
9333f82be0
Reduce dependencies between modules
2017-03-15 17:58:52 +03:00
Kuan-Yi Li
e685dcef0b
Fix typos
2017-03-07 23:42:24 +08:00
Alexander Alekhin
990e87effb
Merge pull request #8111 from utibenkei:saliency-module-java
2017-03-06 14:39:23 +00:00
Alexander Alekhin
92c4b6ae4c
Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters
2017-03-05 10:17:51 +00:00
Philipp Hasper
ec38ef9b10
CameraBridgeViewBase synchronizes on a final field
...
Synchronizing against non-final fields is advised against.
2017-03-03 16:07:10 +01:00
Jose Gómez
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
Hans Gaiser
11b24eb49f
Expose CirclesGridFinderParameters in findCirclesGrid.
2017-03-02 10:53:45 +01:00
utibenkei
6501d54267
Fix bug that occurs when module name and inherited class name are same.
2017-01-31 22:42:30 +09:00
utibenkei
579ffbf97e
Added Java wrapping for tracking module
2016-12-31 02:19:38 +09:00
Alexander Alekhin
d85c11e525
OpenCV version++
...
3.2.0-rc
2016-12-19 17:12:18 +03:00
Alexander Alekhin
61792a839f
java: fix PATH environment variable
2016-12-06 20:01:06 +03:00
Alexander Alekhin
8019498c6e
java tests fixes
2016-11-23 13:53:00 +03:00
Alexander Alekhin
fe29080d59
java: skip test in case of missed classes from opencv_contrib
2016-11-23 13:53:00 +03:00
abratchik
f978ee613e
fix for #7510 , #7511 and #7512
2016-10-31 11:07:56 +04:00
abratchik
78874c568e
fix java wrapper autotests
2016-10-31 10:06:32 +04:00
Alexander Alekhin
1ae27eb696
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1
2016-10-15 09:21:45 +00:00
abratchik
4207ebbce7
fix for VideoCapture crash
2016-10-15 08:16:31 +04:00
Maksim Shabunin
699c25a4be
Merge pull request #7471 from alalek:fix_java_generator
2016-10-13 15:21:39 +00:00
abratchik
084c595855
fix for legacy FeatureDetector and DescriptorMatcher classes
2016-10-13 14:45:59 +04:00
Vadim Pisarevsky
4ed40fd694
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1
2016-10-12 19:54:03 +00:00
Alexander Alekhin
c16c803fe9
java: integrate code from base modules
...
To resolve undefined "Mat_to_vector_KeyPoint" error
2016-10-12 18:01:51 +03:00
abratchik
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
Alexander Alekhin
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
Alexander Alekhin
5da8d65371
eliminate compiler warnings
2016-10-08 02:19:43 +03:00
abratchik
be028d0774
fix for #7420 , #7421
2016-10-07 23:58:57 +04:00
Jcrist99
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
Vadim Pisarevsky
a799cc13d9
Merge pull request #6078 from PolarNick239:master
2016-10-05 17:27:23 +00:00
mshabunin
7a7a2749e0
Fixed java wrappers
2016-09-30 16:21:04 +03:00
Marek Smigielski
1aa14e4929
fix tab for gen_java.py
2016-08-10 12:03:28 +02:00
Marek Smigielski
723b42e0da
Add namespaces and proper support of the pointers
2016-08-05 15:34:57 +02:00
Maksim Shabunin
fc890bd941
Merge pull request #6815 from smigielski:fix_6605
2016-07-14 14:36:45 +00:00
Alexander Alekhin
f9ab93bf0f
Merge pull request #6876 from janstarzy:jni-as-template-redone
2016-07-11 13:06:00 +00:00