Alexander Alekhin
442bc80cd7
pre: OpenCV 4.1.1 (version++)
2019-06-21 19:18:50 +03:00
Alexander Alekhin
2b2633c11f
videoio(gstreamer): port changes from 14834
2019-06-21 14:42:58 +03: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
b8c080de12
valgrind: suppress OpenEXR ThreadPool
2019-06-15 14:38:37 +00:00
Alexander Alekhin
3af1b6ecdc
valgrind: fix issues
2019-06-14 14:31:38 +03: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
c6deba6003
android: fix javadoc
2019-06-06 20:22:42 +00:00
Alexander Alekhin
3c1267dbe6
android: update 'debug' information support
2019-05-19 16:09:45 +00:00
Alexander Alekhin
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
Alexander Alekhin
b38de57f9a
ts: test tags for flexible/reliable tests filtering
...
- added functionality to collect memory usage of OpenCL sybsystem
- memory usage of fastMalloc() (disabled by default):
* It is not accurate sometimes - external memory profiler is required.
- specify common `CV_TEST_TAG_` macros
- added applyTestTag() function
- write memory usage / enabled tags into Google Tests output file (.xml)
2019-04-08 19:12:49 +00:00
Alexander Alekhin
f473b61585
android: build package with API 21
...
enables Video I/O backend via Media NDK
2019-03-20 19:21:43 +03:00
Alexander Alekhin
6501cb93a4
Merge pull request #14104 from alalek:android_build_sdk_reduce_mem_usage
2019-03-20 15:35:05 +00:00
Giles Payne
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
Alexander Alekhin
e8a0bc5794
android: reduce memory consumption by gradle builds
2019-03-19 16:50:08 +03:00
Alexander Alekhin
80e5642ca2
pre: OpenCV 3.4.6 (version++)
2019-03-12 13:29:42 +03:00
Alexander Alekhin
6e2ede8c56
pre: OpenCV 4.1.0 (version++)
2019-03-12 13:01:44 +03: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
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
480c6dae6d
android: backport build_sdk.py
2019-03-04 15:29:09 +03:00
Giles Payne
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
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Alexander Alekhin
a065c10bcb
cmake: workaround iOS try_compile(COPY_FILE) bug
2019-02-25 21:35:46 +00:00
Alexander Alekhin
fcec053d59
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-05 19:12:41 +03:00
Dmitry Kurtaev
8ecc5e6f64
Add tests for features2d JavaScript bindings
2019-02-01 19:12:31 +03:00
Alexander Alekhin
c9ad5779f2
release: OpenCV 4.0.1 (version++)
2018-12-22 07:03:30 +00:00
Alexander Alekhin
1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
Alexander Alekhin
8f1356c3c5
OpenCV version++ (3.4.5)
...
OpenCV 3.4.5
2018-12-21 17:31:20 +03:00
Alexander Alekhin
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00
Alexander Alekhin
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
Alexander Alekhin
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
Adrian Kashivskyy
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
Rijubrata Bhaumik
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
Alexander Alekhin
2e0150e601
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-03 18:38:27 +03:00
Adrian Kashivskyy
b7c134617d
Add ability to specify iPhoneSimulator ARCHS
2018-11-28 19:27:20 +01:00
Alexander Alekhin
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
Alexander Alekhin
a1fe8f754f
OpenCV version++ (3.4.4)
...
OpenCV 3.4.4
2018-11-17 10:22:17 +00:00
Alexander Alekhin
c26dd5d7aa
core: fix issues from valgrind builder
2018-11-17 07:32:06 +00:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
Alexander Alekhin
9a76322ef9
ios: update build script
...
- IPHONEOS_DEPLOYMENT_TARGET=8.0 by default (minimal for XCode 10)
2018-10-24 04:37:31 +00:00
Alexander Alekhin
edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
Alexander Alekhin
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
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Alexander Alekhin
5faaa28870
js: enable calib3d code (no bindings)
2018-10-11 00:49:45 +00:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Alexander Alekhin
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
Alexander Alekhin
8ecdd215b6
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
2018-09-29 12:50:51 +00:00
Alexander Alekhin
4fea6179a0
Merge pull request #12659 from dkurt:js_features2d
2018-09-28 16:18:09 +00:00
Andrew Mroczkowski
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