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
Dmitry Kurtaev
6fbcb283b9
Try to fix "enum struct" wrapping for Java
2018-12-19 13:16:43 +03:00
Alexander Alekhin
a574788e89
move legacy C-API constants into separate files
2018-11-17 23:47:51 +00:00
Alexander Alekhin
2c6f1ab57d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-06 20:04:31 +00:00
berak
eaee63d96b
java: add converters, tests for MatOfRotatedRect
2018-11-06 16:40:56 +01:00
Vadim Pisarevsky
d9b8a9d90e
Merge pull request #13013 from berak:java_MatOfRotatedRect
2018-11-02 12:36:06 +00:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
berak
0cd14e3fb4
java: add support for MatOfRotatedRect
2018-11-01 15:37:23 +01:00
Dmitry Kurtaev
92f754c675
Add methods to reshape Mat in Java by array of shapes and retreive sizes of each dimension.
2018-10-25 10:48:23 +03:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
soonbro
9b9f38afc8
fix typo in FpsMeter.java
...
'mFramesCouner' -> 'mFramesCounter'
2018-09-29 11:36:47 +00:00
Alexander Alekhin
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Dmitry Kurtaev
d486204a0d
Merge pull request #12264 from dkurt:dnn_remove_forward_method
...
* Remove a forward method in dnn::Layer
* Add a test
* Fix tests
* Mark multiple dnn::Layer::finalize methods as deprecated
* Replace back dnn's inputBlobs to vector of pointers
* Remove Layer::forward_fallback from CV_OCL_RUN scopes
2018-09-06 13:26:47 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Hamdi Sahloul
78835ad87a
Support enum arguments for Java binding
2018-09-01 15:04:55 +09:00
Hamdi Sahloul
f89e4e7dd0
Support parsing C++11 enum struct
and enum class
2018-09-01 15:04:54 +09:00
berak
72f422c7dc
java: fix LIST_GET macro
2018-08-30 13:06:02 +02:00
Hamdi Sahloul
900df21b7d
Support enum-type detection for binding generator
2018-08-25 01:58:42 +09:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Dmitry Kurtaev
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
Alexander Alekhin
68c92908d5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-14 15:17:35 +03:00
cclauss
05c1a3d160
print() is a function in Python 3
2018-05-03 07:12:12 +02:00
Alexander Alekhin
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
Alexander Alekhin
6abfc6761e
android: refactor Android SDK detection
...
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
2018-04-05 19:19:31 +00:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Alexander Alekhin
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
Alexander Alekhin
5f5fcef962
Merge pull request #10907 from alalek:cmake_ninja_fix
2018-02-20 18:54:43 +00:00
Alexander Alekhin
807ec00b85
cmake: fix Ninja warning
...
about BYPRODUCTS bin/opencv-340.jar
2018-02-20 13:13:31 +03:00
Alexander Alekhin
cf31243c74
android: add build.grade into Android SDK
...
For using 'OpenCV for Android SDK' with Android Studio projects.
2018-02-19 17:19:26 +03:00
Florian Echtler
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
luz.paz
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
Maksim Shabunin
1b0ff57562
Merge pull request #10621 from mshabunin:disable-docs
...
Documentation generation refactoring (#10621 )
* Documentation build updates:
- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html
* javadoc: fix path in build directory
* cmake: fix "Documentation" status line
2018-01-18 16:37:19 +03:00
Alexander Alekhin
839cffdefe
java: fix MacOS Java problem
2018-01-13 02:12:39 +00:00
Alexander Alekhin
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
Alexander Alekhin
1237faef80
java: disable highgui wrapped code
2018-01-13 02:12:39 +00:00
Alexander Alekhin
a0d9d6db5b
fixes for old CMake (2.8.12.2)
2018-01-13 02:12:39 +00:00
Alexander Alekhin
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
Alexander Alekhin
0cad2d2a83
java: files rename
...
intermediate commit (to simplify code review)
2018-01-12 19:14:00 +00:00
SarenT
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
Alexander Alekhin
f3dde79ed6
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
2018-01-08 19:24:39 +00:00
Moshe
84596bff09
Bitwise "and false"
...
Bitwise "and false" is always false.
2018-01-07 10:12:53 +02:00
Alexander Alekhin
cac4a7e5b5
OpenCV version++
...
OpenCV 3.4.0-rc
2017-12-16 01:30:43 +03:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +03:00
Jcrist99
0608227e10
Merge pull request #9698 from abratchik:parse.doxygen
...
Support @deprecated tag in java wrappers (#9698 )
2017-11-16 16:48:12 +03:00
Florian Echtler
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
Alexander Alekhin
cc3f9323bb
cmake: exclude opencv_java (JNI) from OpenCV C++ modules list
...
for non-ANDROID platforms
2017-11-02 17:06:12 +03:00
Dmitry Kurtaev
bd8e6b7e14
Make external cv::dnn::Importer usage is deprecated
2017-09-18 08:52:36 +03:00