Commit Graph

4648 Commits

Author SHA1 Message Date
Andrey Kamaev
05630b336b Updated package version in Android samples
(cherry picked from commit 47b9640785)

Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
2012-08-28 15:08:23 +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
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 Smorkalov
5acb80a9b1 ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed. 2012-08-21 15:33:23 +04:00
Alexander Smorkalov
9314e3266c Debug build for Android added. Stripping of debug build turned off. 2012-08-21 15:33:19 +04:00
Alexander Smorkalov
7eb9fa14d3 Warning fix. ifdefs for 4.1.1 added. 2012-08-21 15:32:21 +04:00
Alexander Smorkalov
6bb509b44a Android 4.1.1 native camera fix. BufferQueue class is used instaed of Surface texture. Includes in cmake updated. 2012-08-21 15:31:50 +04:00
Alexander Smorkalov
ca6e85f526 Tegra3 package support enabled;
Version code incremented;
2012-08-21 15:31:07 +04:00
Alexander Smorkalov
48aeaf6239 Tegra detector fixed;
Some aditional logs added;
AndroidManifest version incremented.
2012-08-21 15:30:30 +04:00
Alexander Smorkalov
b1811a8bf6 HW compatibility tests added;
Arm-v7a neon package support enabled.
2012-08-21 15:29:57 +04:00
Alexander Smorkalov
44aeff04ae Package name logic improved;
Aditional tests added;
Some bug fixes with different __SUPPORT_XXX defines.
2012-08-21 15:29:11 +04:00
Alexander Smorkalov
a82fc0a046 Unit tests updated. Version and HW compatiblity tests added;
Tegra3, neon, sseX, x64 support uncomment and guarded by ifdefs
2012-08-21 15:15:40 +04:00
Daniil Osokin
cd062b7cc0 Add ignore for *.user files 2012-08-21 15:05:07 +04:00
Andrey Kamaev
6007bbc82d Added ignore for tbb source tarballs 2012-08-21 15:04:00 +04:00
Vadim Pisarevsky
2c7c9d0915 added gitignore to filter out certain temporary files 2012-08-21 15:03:54 +04:00
Andrey Pavlenko
c42c3ebc9c duplicating cv::error() message to Android logcat 2012-08-08 16:45:29 +04:00
Andrey Pavlenko
73f95e59f3 Tegra3 package support enabled; Service version code incremented.
Android 4.1.1 native camera fix (shared libraries for native Android camera updated).
2012-07-31 15:22:58 +04:00
Andrey Pavlenko
dea7f92c86 updating URL to Android info start page 2012-07-30 10:39:59 +04:00
Andrey Pavlenko
e2b9c65b35 updating README content 2012-07-30 10:36:23 +04:00
marina.kolpakova
afc0cf8c4e fixed surf for upright case 2012-07-25 12:21:35 +04:00
Maria Dimashova
29f86df585 merged with r9002 (fix for SURF descriptor) 2012-07-17 14:24:54 +00:00
Andrey Pavlenko
9f4c5afbbb merging r9039-9040,9044 from trunk (warnings and message in Java) 2012-07-15 13:20:38 +00:00