0d1a0b126b
Merge pull request #14005 from komakai:android-video-cap
...
* Add Android Media NDK video i/o file capture back-end
* Fix failing test
* Improve error handling/prevent resource leaks
* Add license text
* Modify default for WITH_ANDROID_MEDIANDK option
* Fix spelling of deleter_AMediaExtractor
2019-03-19 21:28:45 +03:00
e8a0bc5794
android: reduce memory consumption by gradle builds
2019-03-19 16:50:08 +03:00
80e5642ca2
pre: OpenCV 3.4.6 (version++)
2019-03-12 13:29:42 +03:00
6e2ede8c56
pre: OpenCV 4.1.0 (version++)
2019-03-12 13:01:44 +03:00
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
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
480c6dae6d
android: backport build_sdk.py
2019-03-04 15:29:09 +03:00
7444f0c651
Merge pull request #13939 from komakai:android-build-improvements
...
* Android build improvements
* look for NDK in "ndk-bundle" directory under the SDK directory if location not specified
* look for cmake and ninja in "cmake" directory under the SDK directory if not found in the path
* disable use of ccache if not found in the path
* Redo build tool existence checks
2019-03-04 15:19:29 +03:00
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
a065c10bcb
cmake: workaround iOS try_compile(COPY_FILE) bug
2019-02-25 21:35:46 +00:00
fcec053d59
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-05 19:12:41 +03:00
8ecc5e6f64
Add tests for features2d JavaScript bindings
2019-02-01 19:12:31 +03:00
c9ad5779f2
release: OpenCV 4.0.1 (version++)
2018-12-22 07:03:30 +00:00
1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
8f1356c3c5
OpenCV version++ (3.4.5)
...
OpenCV 3.4.5
2018-12-21 17:31:20 +03:00
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00
d5f430cc11
android: gradle wrapper
...
https://github.com/gradle/gradle/tree/v4.6.0
License: Apache 2.0
2018-12-18 15:45:45 +03:00
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
00285a5e88
Merge pull request #13424 from akashivskyy:pr/ios-nonfree
...
Add ability to build iOS and macOS frameworks with nonfree modules (#13424 )
* Allow building ios framework with nonfree
* Allow building osx framework with nonfree
2018-12-12 17:32:19 +03:00
e70786e05e
Merge pull request #13300 from riju:photoModule
...
* Enable Javascript bindings for photo module.
1. Enable the build flag in build_js.py.
2. Append js into WRAP list of photo’s CMakefiles.txt
3. Add photo module's API into JS API whitelist (embindgen.py)
Exposing the HDR imaging part of photo module.
[TODO]
Add tests
Fix opencv/doc/js_tutorials/
* [WIP] TODO: Add tests
* Remove TonemapDurand: algorithm patented in US, so moved to opencv_contrib
* Fix ningxin's comment: expose the base class.
* Add some more simple binding tests.
Also expose process function
2018-12-09 15:08:59 +03:00
2e0150e601
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-03 18:38:27 +03:00
b7c134617d
Add ability to specify iPhoneSimulator ARCHS
2018-11-28 19:27:20 +01:00
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
a1fe8f754f
OpenCV version++ (3.4.4)
...
OpenCV 3.4.4
2018-11-17 10:22:17 +00:00
c26dd5d7aa
core: fix issues from valgrind builder
2018-11-17 07:32:06 +00:00
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
9a76322ef9
ios: update build script
...
- IPHONEOS_DEPLOYMENT_TARGET=8.0 by default (minimal for XCode 10)
2018-10-24 04:37:31 +00:00
edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
f185640eda
Merge pull request #12799 from alalek:update_build_js
...
* js: update build script
- support emscipten 1.38.12 (wasm is ON by default)
- verbose build messages
* js: use builtin Math functions
* js: disable tracing code completelly
2018-10-15 17:35:21 +03:00
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
5faaa28870
js: enable calib3d code (no bindings)
2018-10-11 00:49:45 +00:00
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
8ecdd215b6
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
2018-09-29 12:50:51 +00:00
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
2018-09-28 16:18:09 +00:00
3c5a6be835
Fix Xcode version parsing error (affects bitcode generation)
...
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
2018-09-28 17:01:40 +03:00
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
e9f99063c7
JavaScript bindings for features2d module
2018-09-28 11:04:13 +03:00
fe56bdeeb9
Merge pull request #12647 from alalek:cmake_js_cleanup
...
* cmake: js cleanup
- avoid unnecessary 2 messages for other platforms
- drop MODULE_NAME variable
* js: cleanup build_js.py
2018-09-26 18:53:02 +03:00
a956732874
cmake: update install paths (Linux)
2018-09-19 15:43:52 +03:00
879e046b22
Merge pull request #12586 from Slyce-Inc:bug-xcode10-compile
2018-09-19 10:58:51 +00:00
b6d5565df1
build: fix Xcode 10 build problems
...
Updating the base SDK from 6.0 to 8.0 where applicable
2018-09-18 15:42:03 -04:00
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
80b62a41c6
Merge pull request #12411 from vpisarev:wide_convert
...
* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion
* fixed compile warnings
* fix some more compile errors
* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)
* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
* trying to fix ARM-neon builds
2018-09-06 19:36:59 +03:00
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
c85e44697e
cmake: drop unconditional forcing of CMAKE_SKIP_RPATH=TRUE
...
CMake "cache" entry for CMAKE_SKIP_RPATH is in the end of this file
2018-09-02 21:48:10 +00:00
fcfa488250
build: fix js build (make video->calib3d dependency optional)
...
- estimateRigidTransform() is excluded from JS bindings
2018-08-31 14:29:25 +03:00
c1db75e0c7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-29 16:24:56 +03:00
Giles Payne
Alexander Alekhin
Alexander Alekhin
Dmitry Kurtaev
Adrian Kashivskyy
Rijubrata Bhaumik
Andrew Mroczkowski
Vadim Pisarevsky