Alexander Alekhin
13c6eb42e9
Merge pull request #20731 from komakai:matrix_mult_android_ios
2021-10-05 15:35:58 +00:00
Giles Payne
19a880bb91
Simple matrix multiplication for Mat in iOS/Android
2021-10-05 20:16:06 +09:00
Alexander Alekhin
37c3f0d8a0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-02 17:57:18 +00:00
Jannik Bamberger
ef53a9229f
Automatically set the correct OpenCV version in build.gradle
...
Automatically sets the correct OpenCV version in the CMAKE example contained in the build.gradle
file of the Android SDK.
2021-10-02 16:06:33 +02:00
Alexander Alekhin
4c05a697fa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-28 21:30:28 +00:00
Alexander Alekhin
8ee33ca551
java(test): avoid deprecation warning
...
- 'new Byte' => 'Byte.valueOf'
2021-08-28 02:10:05 +00:00
Alexander Alekhin
8d1f254dcc
java: force using of 'Ptr<>' for OpenCV classes
...
backport of commit: e5841d3126
2021-07-02 21:20:08 +00:00
Alexander Alekhin
e5841d3126
java: force using of 'Ptr<>' for OpenCV classes
2021-07-02 21:13:49 +00:00
Alexander Alekhin
7a5f554bc4
Merge branch 4.x
2021-06-13 10:27:44 +00:00
Giles Payne
f1f9121bc7
Add test for Java Mat.at
2021-06-06 20:09:13 +09:00
Giles Payne
3b42e19505
At-like function for Java/Kotlin
2021-06-06 20:09:13 +09:00
Alexander Alekhin
b91e0dca90
Merge branch 4.x
2021-06-04 15:18:51 +00:00
Alexander Alekhin
3e513ee6ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-03 16:23:36 +00:00
Alexander Smorkalov
1212aef03b
Analog of gtest_filter for java tests.
2021-06-01 11:04:18 +03:00
Alexander Alekhin
fc628014bb
Merge branch 4.x
2021-04-10 18:03:01 +00:00
Alexander Alekhin
e0265c67c6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-27 17:41:57 +00:00
Giles Payne
0553543e6e
Merge pull request #19597 from komakai:android-ndk-camera
...
Android NDK camera support
* Add native camera video backend for Android
* In the event of a "No buffer available error" wait for the appropriate callback and retry
* Fix stale context when creating a new AndroidCameraCapture
* Add property handling
2021-02-25 19:14:11 +00:00
Giles Payne
5cf08b0722
Fix/optimize Android put/get functions
2021-02-19 17:10:11 +09:00
Alexander Alekhin
de385009ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-09 18:09:00 +00:00
Alexander Alekhin
fb85974d01
android: use protected fields in JavaCamera2View
2020-12-08 05:18:21 +00:00
Vadim Pisarevsky
d6c699c014
calib3d module in opencv is split into 3 modules: 3d, calib and stereo.
...
stereo module in opencv_contrib is renamed to xstereo
2020-12-01 23:42:15 +03:00
Alexander Alekhin
dde3cb3b99
java: workaround handling of base class
2020-11-16 06:03:30 +00:00
Alexander Alekhin
3826158547
java: 'namespace_' class prefix, support inner classes
...
- support multi-level namespaces
- support inner classes (Params)
- reduce scope of 'using namespace' in JNI C++ code
2020-11-13 23:21:03 +00:00
Alexander Alekhin
a7c150ec66
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-13 22:29:14 +00:00
Alexander Alekhin
41c2669476
java: robust code generation
...
- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order
2020-11-13 13:42:26 +00:00
Alexander Alekhin
39d5e14c1f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-07 09:09:37 +00:00
Alexander Alekhin
644de8f22a
java: fix javadoc generation
2020-10-06 04:28:25 +00:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Alexander Smorkalov
821fac187c
Generate constructor with smart pointer, if it's expected.
2020-05-29 16:40:19 +03:00
Alexander Alekhin
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
Nicolas Roduit
400a781ebf
Prefer addall instead of iteration for performance
2020-05-14 11:42:24 +03:00
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
spectralio
1cce9db710
fix missing underscore
2020-04-17 13:08:32 +02:00
Alexander Alekhin
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Polina Smolnikova
acc089ca64
Merge pull request #15338 from rayonnant14:my_detect_and_decode_3.4
...
QR-Code detector : multiple detection
* change in qr-codes detection
* change in qr-codes detection
* change in test
* change in test
* add multiple detection
* multiple detection
* multiple detect
* add parallel implementation
* add functional for performance tests
* change in test
* add perftest
* returned implementation for 1 qr-code, added support for vector<Mat> and vector<vector<Point2f>> in MultipleDetectAndDecode
* deleted all lambda expressions
* changing in triangle sort
* fixed warnings
* fixed errors
* add java and python tests
* change in java tests
* change in java and python tests
* change in perf test
* change in qrcode.cpp
* add spaces
* change in qrcode.cpp
* change in qrcode.cpp
* change in qrcode.cpp
* change in java tests
* change in java tests
* solved problems
* solved problems
* change in java and python tests
* change in python tests
* change in python tests
* change in python tests
* change in methods name
* deleted sample qrcode_multi, change in qrcode.cpp
* change in perf tests
* change in objdetect.hpp
* deleted code duplication in sample qrcode.cpp
* returned spaces
* added spaces
* deleted draw function
* change in qrcode.cpp
* change in qrcode.cpp
* deleted all draw functions
* objdetect(QR): extractVerticalLines
* objdetect(QR): whitespaces
* objdetect(QR): simplify operations, avoid duplicated code
* change in interface, additional checks in java and python tests, added new key in sample for saving original image from camera
* fix warnings and errors in python test
* fix
* write in file with space key
* solved error with empty mat check in python test
* correct path to test image
* deleted spaces
* solved error with check empty mat in python tests
* added check of empty vector of points
* samples: rework qrcode.cpp
* objdetect(QR): fix API, input parameters must be first
* objdetect(QR): test/fix points layout
2020-01-26 22:18:42 +03:00
Alexander Alekhin
c30af724ef
Merge pull request #16349 from hannesa2:RemoveEclipseRelicts
2020-01-16 16:53:06 +00:00
Alexander Alekhin
1f8802b94d
Merge pull request #16351 from hannesa2:finishAndroidVersionGradleStyle
2020-01-16 15:17:17 +00:00
Alexander Alekhin
a90dacdf75
android: fix javadoc
2020-01-15 19:44:27 +03:00
Hannes Achleitner
afc8dd5661
remove Eclipse relicts in Android sample
2020-01-15 07:19:58 +01:00
Hannes Achleitner
52f930cca7
finish Android version info to Gradle style
2020-01-15 06:34:42 +01:00
hannesa2
43a91f82fe
Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo
...
Android move version info to Gradle style
* move version info to Gradle style
* Use VERSION_NAME in loader
* apply review suggestion
2020-01-03 19:15:35 +03:00
Alexander Alekhin
9ec3d76b21
Merge pull request #16241 from bwignall:typo
2019-12-27 16:18:57 +00:00
Brian Wignall
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
Brian Wignall
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
Hannes Achleitner
2da7360b63
Remove Android Eclipse relicts
2019-12-24 07:38:12 +01:00
Alexander Alekhin
4c86fc13cb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-19 15:09:05 +03:00
Alexander Alekhin
9cd1d087c3
android(camera2): apply .disconnectCamera() patch from issue 13574
2019-12-19 00:29:53 +00:00
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
...
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Alexander Alekhin
ea5499fa51
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-29 20:46:51 +00:00
Alexander Alekhin
80c4cedd25
android: use .getRowStride() in JavaCamera2View
2019-10-28 18:45:56 +00:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Alexander Alekhin
86e7d82418
javadoc: fix generation with OpenJDK 11
2019-10-16 18:14:07 +03:00
luz.paz
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
Giles Payne
2734291b35
Add CameraActivity utility class to automate Camera permission request handling
2019-07-20 13:40:10 +09:00
Alexander Alekhin
95415ac3a5
android: change ANDROID_STL='c++_shared'
...
- fixes crashes in face-detector application
- libc++_shared.so is bundled automatically via CMake helper project
2019-07-12 18:58:02 +00:00
Alexander Alekhin
f663e8f903
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-09 19:57:57 +00:00
Alexander Alekhin
3998b41d68
android: JavaCamera2View use calculateCameraFrameSize() method
...
from CameraBridgeViewBase (common base with JavaCameraView)
2019-07-04 21:43:09 +00:00
Alexander Alekhin
66d7956e67
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-15 16:25:11 +00:00
Alexander Alekhin
f9eab2de5e
Merge pull request #14673 from janstarzy:hidden-vis-with-java7
2019-06-13 17:59:39 +00:00
Jan Starzynski
e9ed7eb68d
make -fvisibility=hidden work with java 1.7
2019-06-13 17:39:10 +02:00
Alexander Alekhin
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
Alexander Alekhin
60fb1fde75
java: wrap StringIO() to support unicode strings
2019-06-07 17:05:58 +03:00
Alexander Alekhin
c6deba6003
android: fix javadoc
2019-06-06 20:22:42 +00:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Ahmed Ashour
5c56b8ce92
java: generated code to have javadoc
2019-06-05 12:44:03 +02:00
Alexander Alekhin
29b3f66507
Merge pull request #14606 from asashour:java_inline_return
2019-05-29 20:03:54 +00:00
Alexander Alekhin
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Ahmed Ashour
ca8a1d2cff
java: generated code inline return
2019-05-28 08:34:02 +02:00
Alexander Alekhin
d73261844e
Merge pull request #14622 from asashour:junit
2019-05-27 14:55:45 +00:00
Alexander Alekhin
c5204a74c0
Merge pull request #14633 from alalek:java_test_filter
2019-05-27 14:13:25 +00:00
Alexander Alekhin
b958498074
java(test): test package filtering
...
Usage example:
- run.py -a -t java --package=calib3d
2019-05-26 15:12:05 +00:00
Alexander Alekhin
171dd9eff5
java(test): enable debug mode to show useful stacktraces
2019-05-26 14:54:44 +00:00
Ahmed Ashour
f9564e053d
java: test: use assertNotNull and assertFalse
2019-05-24 10:45:09 +02:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Ahmed Ashour
f3319f6140
java: remove redundant declaration of java.lang package
2019-05-23 14:06:34 +02:00
Alexander Alekhin
3c1267dbe6
android: update 'debug' information support
2019-05-19 16:09:45 +00:00
Alexander Alekhin
e21262deba
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-16 04:40:39 +00:00
Alexander Alekhin
8936a0f3a5
android: fix JavaCamera2View UV plane handling
2019-05-15 07:57:50 +00:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00
Alexander Alekhin
84847cf4c3
Merge pull request #14342 from Victorlouisdg:bugfix-JavaCamera2View-green
2019-04-29 10:54:34 +00:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
52f16e0f55
tests: workaround for DYLD_LIBRARY_PATH on Apple MacOSX
2019-04-17 15:19:33 +03:00
vdgussem
00861b668a
Changed the way Images are converted into rgba Mats so that JavaCamera2View also shows correct colors when the Image contains I420 or YV12 data
2019-04-16 01:38:59 +02:00
Dmitry Kurtaev
4c2100e02c
Merge pull request #14266 from dkurt:fix_qrcode_decode_java
...
* Fix decode and detectAndDecode Java wrappers for QRCodeDetector
* revert changes in objdetect
* java: fix wrapping of std::string type
2019-04-05 17:15:51 +03:00
Alexander Alekhin
1fa3d21f6a
android: don't install java/build.gradle
2019-03-13 18:52:15 +00:00
Alexander Alekhin
8c0b0714e7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-11 19:20:22 +00:00
Giles Payne
55f02d8c66
Merge pull request #14011 from komakai:debug-build
...
* Add Android SDK debug build flag
* Change LOG_TAG define for consistency with other modules
2019-03-11 17:16:42 +03:00
Giles Payne
11dbd86aa3
Merge pull request #13956 from komakai:java-mat-class-improvements
...
* Expose more C++ functionality in the Java wrapper of the Mat class
In particular expose methods for handling Mat with more than 2 dimensions
* add constructors taking an array of dimension sizes
* add constructor taking an existing Mat and an array of Ranges
* add override of the create method taking an array of dimension sizes
* add overrides of the ones and zeros methods taking an array of dimension sizes
* add override of the submat method taking an array of ranges
* add overrides of put and get taking arrays of indices
* add wrapper for copySize method
* fix crash in the JNI wrapper of the reshape(int cn, int[] newshape) method
* add test for each method added to Mat.java
* Fix broken test
2019-03-10 00:11:04 +03:00
Adrian Renner
442fdfd4b2
Merge pull request #13999 from addyi:fixAndroidLintingErrors
...
* fix android lint error in BaseLoaderCallback (LongLogTag)
Lint Error that was causde by the to long TAG:
BaseLoaderCallback.java:31:
Error: The logging tag can be at most 23 characters,
was 31 (OpenCVLoader/BaseLoaderCallback) [LongLogTag]
Log.e(TAG, "Package installation failed!");
* add requested "OCV" prefix for android logging
2019-03-07 23:18:22 +03:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
0a98bc0ee9
java: avoid enum values with references on other enums
...
declaration order is not fixed
Error message:
Core.java:97: error: illegal forward reference
Hamming_normType = NORM_HAMMING,
2019-03-01 21:32:03 +00:00
Alexander Alekhin
f5b58e5fc9
bindings: backport generator from OpenCV 4.x
...
- better handling of enum arguments
- less merge conflicts
2019-03-01 20:18:48 +00:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Jaewoo Song
225bdc21c0
Making JavaCamera2View behaves in the same way as JavaCameraView
2019-02-26 14:18:29 +08:00
Alexander Alekhin
1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
Alexander Alekhin
578ea4bae9
Merge pull request #13386 from alalek:android_gradle
2018-12-21 13:56:03 +00:00
Alexander Alekhin
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00