Commit Graph

6260 Commits

Author SHA1 Message Date
Andrey Kamaev
bcf8dd510f Added CCache support to Android build
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:

export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Andrey Kamaev
5c01d13f38 Pass list of modules to javadoc generator
Previously the generator always uses hardcoded list of modules.
This fix replaces hardcoded list with actual set of modules coming from cmake.
2012-08-27 16:48:09 +04:00
Vsevolod Glumov
c78884c780 Improved 'Operations on Arrays" section of 'Core' module documentation. 2012-08-24 19:08:18 +04:00
Anatoly Baksheev
4449efb242 minor 2012-08-24 19:01:13 +04:00
Anatoly Baksheev
d3f4c9b2dc Fixed bug in BP_GPU 2012-08-24 18:38:54 +04:00
Andrey Kamaev
0948f4f863 Merge branch 'android_camera_2.4' into 2.4 2012-08-24 16:55:44 +04:00
Andrey Kamaev
4aa03d4b2b Fix/workaround bogus error in Android samples running on Android 4.1.1 2012-08-24 16:55:12 +04:00
Andrey Kamaev
eaf75dbc95 Fix crash on resume in face detection sample 2012-08-24 16:55:12 +04:00
Andrey Kamaev
c9d078ab00 Fix formatting in detection based tracker 2012-08-24 16:55:12 +04:00
Andrey Kamaev
a4235948a7 Fix Andoid samples: black screen after resume problem 2012-08-24 16:55:12 +04:00
Andrey Kamaev
d849f51023 Android camera: commented logs in frame callback 2012-08-24 16:55:12 +04:00
Andrey Kamaev
4ac2c22776 Fix buffer allocation in Android camera 2012-08-24 16:55:12 +04:00
Andrey Kamaev
a21df069e0 Cherry pick Android-related changes from master till 2012-08-23
* service
* tutorials
* samples
* gitignore
2012-08-24 16:52:30 +04:00
Andrey Kamaev
42a4ed6ebf Merge branch 'android_camera' 2012-08-24 16:44:52 +04:00
Andrey Kamaev
ba862ffdff Fix/workaround bogus error in Android samples running on Android 4.1.1 2012-08-24 16:24:53 +04:00
Andrey Kamaev
e9e0668549 Fix crash on resume in face detection sample 2012-08-24 16:24:53 +04:00
Andrey Kamaev
ce11c0d1eb Fix formatting in detection based tracker 2012-08-24 16:22:18 +04:00
Andrey Kamaev
285af48040 Fix Andoid samples: black screen after resume problem 2012-08-24 16:17:42 +04:00
Andrey Kamaev
71df8906be Android camera: commented logs in frame callback 2012-08-24 16:10:17 +04:00
Andrey Kamaev
ad35f317f6 Fix buffer allocation in Android camera 2012-08-24 16:10:17 +04:00
Andrey Kamaev
dd3b09441f Fix formatting in Android tutorials 2012-08-24 15:59:46 +04:00
Andrey Kamaev
62f9c0e140 Fixed layout in third Android tutorial 2012-08-24 15:59:46 +04:00
Vsevolod Glumov
3c8e151c73 Reviewed 'android_dev_intro' 2012-08-24 15:59:46 +04:00
Andrey Pavlenko
69538c3596 improving android tutorial v2 2012-08-24 15:59:45 +04:00
Andrey Pavlenko
1e25e736f0 improving android tutorial v2 2012-08-24 15:59:45 +04:00
Andrey Pavlenko
efc87105a3 improving android tutorial v2, removing v1 2012-08-24 15:59:45 +04:00
Vsevolod Glumov
526efe6724 Reviewed 'android_dev_intro' and 'O4A_SDK' 2012-08-24 15:59:45 +04:00
Andrey Kamaev
8facfd4fc8 Fixed tutorial link to NVIDIA Tegra platform 2012-08-24 15:59:45 +04:00
Andrey Pavlenko
6946213ecf improving android tutorial v2 2012-08-24 15:59:45 +04:00
Oleg Sklyarov
a053f611a4 ubuntu screenshot png 2012-08-24 15:59:45 +04:00
Oleg Sklyarov
c24549742b Android device recognition in Ubuntu Linux manual 2012-08-24 15:59:45 +04:00
Vsevolod Glumov
5577485755 some minor fixes to the 'android_dev_intro' 2012-08-24 15:59:45 +04:00
Vsevolod Glumov
2eb1a6d9d6 added a short preface to the 'android_dev_intro' doc. 2012-08-24 15:59:44 +04:00
Andrey Pavlenko
2315d5988f android tutorial, part 1 - adding 'device connection via usb' section, sections reordering 2012-08-24 15:59:44 +04:00
Oleg Sklyarov
71f032699d android tutorial minor layout fix (also my first test commit) 2012-08-24 15:59:44 +04:00
Andrey Kamaev
b29a639608 Fixed links in formatting in Android intro tutorial 2012-08-24 15:59:44 +04:00
Andrey Kamaev
5c788df83a Fix several documentation build warnings
Conflicts:
	modules/gpu/doc/video.rst
	modules/ocl/doc/ocl.rst
2012-08-24 15:59:44 +04:00
Andrey Pavlenko
9e171c9e26 android tutorial v2, initial draft commit 2012-08-24 15:59:44 +04:00
Andrey Kamaev
639bbec44a svn repository web references are replaced with links to git 2012-08-24 15:59:43 +04:00
marina.kolpakova
b061d4847f minor in license file 2012-08-24 15:59:43 +04:00
Andrey Pavlenko
afe8fbb018 minor update (pictures resize removed, emulator screen-shot downscaled) 2012-08-24 15:59:43 +04:00
Andrey Pavlenko
7b68271e31 minor updates to android tutorials 2012-08-24 15:59:43 +04:00
Alexander Kapustin
1b5903a719 Laplacian tegra optimized was added 2012-08-24 14:36:16 +04:00
Anatoly Baksheev
70204a8e68 Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now 2012-08-24 02:02:42 +04:00
Andrey Kamaev
9be63c50dd Merge branch 'norm_Matx' of git://github.com/vrabaud/opencv 2012-08-24 00:38:10 +04:00
Vladislav Vinogradov
56b7ddad09 fixed type for threshold parameter 2012-08-23 17:12:44 +04:00
Vladislav Vinogradov
8c1f9bafdc fixed gpu::integral for Kepler 2012-08-23 17:12:43 +04:00
Vladislav Vinogradov
c3f277b7bc gpu version of HoughCircles 2012-08-23 17:12:43 +04:00
Anatoly Baksheev
e60a50c43c removed /EHa flag for cuda compilation 2012-08-23 16:53:53 +04:00
Anatoly Baksheev
290030d030 possibility to enable /mp compiler flag from cmake
fixed MCVC warnings
2012-08-23 16:53:53 +04:00