mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 16:35:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,402 Commits 6 Branches 126 Tags 3 GiB
0556450801
Commit Graph

122 Commits

Author SHA1 Message Date
Alexander Alekhin
560f85f8e5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2020-01-28 14:26:57 +03:00
Miguel Pari Soto
814a5cec41 feat(android): add support for android modules selection 2020-01-22 19:14:34 +03:00
Hannes Achleitner
afc8dd5661 remove Eclipse relicts in Android sample 2020-01-15 07:19:58 +01:00
Alexander Alekhin
76a27e3399 pre: OpenCV 3.4.9 (version++) 2019-12-05 18:28:38 +00:00
Alexander Alekhin
0fda243a05 pre: OpenCV 3.4.8 (version++) 2019-09-02 14:20:49 +03:00
Alexander Alekhin
19a4b51371 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-08-16 18:48:08 +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
Alexander Alekhin
5ef548a985 cmake: update initialization 2019-08-08 15:23:16 +03:00
Giles Payne
a897fc91ec Add no_samples_build option to Android SDK build 2019-07-18 21:31:02 +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
779f59da6b pre: OpenCV 3.4.7 (version++) 2019-06-21 16:57:17 +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
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
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
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
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
c1db75e0c7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-29 16:24:56 +03:00
Alexander Alekhin
b38c50b3d0 OpenCV 3.4.3 2018-08-28 15:58:21 +03:00
Alexander Alekhin
bb45bf9695 android: NDK17 support 
tested with NDK 17b (17.1.4828580)
 2018-08-27 21:07:34 +00:00
Alexander Alekhin
c1df9ad456 OpenCV version++ 
OpenCV 3.4.3
 2018-08-14 14:10:37 +03:00
Alexander Alekhin
2da96be217 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-09 19:44:51 +03:00
Alexander Alekhin
d69a327d6d OpenCV version++ 
OpenCV 3.4.2
 2018-06-10 10:20:38 +03:00
Alexander Alekhin
45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.
 2018-06-04 19:26:10 +03:00
Vlad Kraevskiy
90ba69a403 Fixed a typo in android toolchain documentation. 2018-06-01 12:39:34 +03:00
Alexander Alekhin
68c92908d5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-14 15:17:35 +03:00
Alexander Alekhin
78f205ffa5 python: better Python 3 support 2018-05-11 17:32:04 +03:00
Alexander Alekhin
000a13b6a3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-03 14:30:38 +00:00
cclauss
d4a966c7c4 Fix Python string formatting 2018-05-03 07:47:34 +02:00
Alexander Alekhin
0bd33c8d1c android: don't use relative paths to contrib modules 2018-04-25 14:31:35 +03:00
Alexander Alekhin
b07f772f36 android: enable C++11 in test sample 2018-04-10 18:09:54 +03:00
Alexander Alekhin
4990506948 cuda: WITH_CUDA=OFF by default (need to enable it explicitly) 2018-04-05 19:23:58 +00:00
Alexander Alekhin
6ffc48769a OpenCV version++ 
OpenCV 3.4.1
 2018-02-23 11:38:33 +03:00
luz.paz
d47b1f3b70 Misc. ./apps ./doc ./platoforms typos 
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
 2018-02-08 13:04:34 -05:00
Alexander Alekhin
edcbbee979 android: update build_sdk.py 
- configuration files for ABIs configuration
- use builtin Android NDK's toolchain by default (force flag to use OpenCV's toolchain)
- default values for 'work_dir' and 'opencv_dir'
 2018-01-14 16:05:48 +00:00
Alexander Alekhin
08086178bd android: fix SDK build 
- fix Javadoc:
  - generate Javadoc after gather step to process all Java files (including Android 21)
  - generate into 'OpenCV-android-sdk' directly without additional copy step
- use smart copy/move utility functions ('shutil' doesn't well with existed destination)
- by default move files to reduce pressure on storage I/O (> 800Mb)
 2018-01-13 02:12:39 +00:00
Alexander Alekhin
d01a2038ae cmake(android): update CMAKE_FIND_ROOT_PATH_MODE_* handling 
Avoids this error message with CMake 3.10:
CMake Error: CMake was unable to find a build program corresponding to "Ninja".
CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build tool.

Related changes is that pkg-config tool is found (/usr/bin/pkg-config).
 2018-01-05 05:59:08 +00:00