7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
821fac187c
Generate constructor with smart pointer, if it's expected.
2020-05-29 16:40:19 +03:00
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
400a781ebf
Prefer addall instead of iteration for performance
2020-05-14 11:42:24 +03:00
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
1cce9db710
fix missing underscore
2020-04-17 13:08:32 +02:00
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
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
c30af724ef
Merge pull request #16349 from hannesa2:RemoveEclipseRelicts
2020-01-16 16:53:06 +00:00
1f8802b94d
Merge pull request #16351 from hannesa2:finishAndroidVersionGradleStyle
2020-01-16 15:17:17 +00:00
a90dacdf75
android: fix javadoc
2020-01-15 19:44:27 +03:00
afc8dd5661
remove Eclipse relicts in Android sample
2020-01-15 07:19:58 +01:00
52f930cca7
finish Android version info to Gradle style
2020-01-15 06:34:42 +01:00
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
9ec3d76b21
Merge pull request #16241 from bwignall:typo
2019-12-27 16:18:57 +00:00
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
2da7360b63
Remove Android Eclipse relicts
2019-12-24 07:38:12 +01:00
4c86fc13cb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-19 15:09:05 +03:00
9cd1d087c3
android(camera2): apply .disconnectCamera() patch from issue 13574
2019-12-19 00:29:53 +00:00
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
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
ea5499fa51
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-29 20:46:51 +00:00
80c4cedd25
android: use .getRowStride() in JavaCamera2View
2019-10-28 18:45:56 +00:00
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
86e7d82418
javadoc: fix generation with OpenJDK 11
2019-10-16 18:14:07 +03:00
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
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
2734291b35
Add CameraActivity utility class to automate Camera permission request handling
2019-07-20 13:40:10 +09:00
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
f663e8f903
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-09 19:57:57 +00:00
3998b41d68
android: JavaCamera2View use calculateCameraFrameSize() method
...
from CameraBridgeViewBase (common base with JavaCameraView)
2019-07-04 21:43:09 +00:00
66d7956e67
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-15 16:25:11 +00:00
f9eab2de5e
Merge pull request #14673 from janstarzy:hidden-vis-with-java7
2019-06-13 17:59:39 +00:00
e9ed7eb68d
make -fvisibility=hidden work with java 1.7
2019-06-13 17:39:10 +02:00
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
60fb1fde75
java: wrap StringIO() to support unicode strings
2019-06-07 17:05:58 +03:00
c6deba6003
android: fix javadoc
2019-06-06 20:22:42 +00:00
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
5c56b8ce92
java: generated code to have javadoc
2019-06-05 12:44:03 +02:00
29b3f66507
Merge pull request #14606 from asashour:java_inline_return
2019-05-29 20:03:54 +00:00
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
ca8a1d2cff
java: generated code inline return
2019-05-28 08:34:02 +02:00
d73261844e
Merge pull request #14622 from asashour:junit
2019-05-27 14:55:45 +00:00
c5204a74c0
Merge pull request #14633 from alalek:java_test_filter
2019-05-27 14:13:25 +00:00
b958498074
java(test): test package filtering
...
Usage example:
- run.py -a -t java --package=calib3d
2019-05-26 15:12:05 +00:00
171dd9eff5
java(test): enable debug mode to show useful stacktraces
2019-05-26 14:54:44 +00:00
f9564e053d
java: test: use assertNotNull and assertFalse
2019-05-24 10:45:09 +02:00
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Alexander Alekhin