4661 Commits

Author SHA1 Message Date
Alexander Smorkalov
e9009db667 All HTC One S related changes reverted due to applyProperties problems on other devices. Libraries rebuilt.
(cherry picked from commit 8104164c78f62046f014ea273c23d64e1f6d8c26)
2012-09-14 19:23:36 +04:00
Alexander Smorkalov
af2de86914 Native camera fix for Nexus 7 with Android JB. Camera build script updated.
(cherry picked from commit afe30d0f8a62af58f396db8ca87bb32bdcf97acb)
2012-09-12 15:29:17 +04:00
Alexander Smorkalov
8a8e719690 getWidth/getHeight optimized.
(cherry picked from commit 7d4432df27d1ff8f0f09cae90a7d613d5122baf2)
2012-09-10 17:15:54 +04:00
Alexander Smorkalov
0ab954a3c4 Issue #2270 OpenCV Manager fails with JNI error fixed.
Local reference table overflow in JNI code fixed.
(cherry picked from commit 457c8785383c89c766f613d8b581ec00ddd2a4d7)
2012-09-07 18:12:41 +04:00
Alexander Smorkalov
0efa9d4c06 Build script for all native cameras added.
(cherry picked from commit b16b50d61b552a7f7eb3f86c2b28bcb9d933f0a4)
2012-09-07 17:37:33 +04:00
Alexander Smorkalov
a12baf180a All native camera libraries rebuild after HTC One S fix.
(cherry picked from commit 568d9583c1621e78a966a131a92e515c4d2f5a26)
2012-09-07 17:37:32 +04:00
Alexander Smorkalov
da167d8f38 Issue #2248 OpenCV manager fails to determine hardware platfrom on Android Emulator fixed.
Search keys for /proc/sysinfo updated.
(cherry picked from commit db3a35f90125eb13716cc323802662c240e4cd2a)
2012-09-07 17:37:31 +04:00
Alexander Smorkalov
c07ba32e16 Native camera issue on HTC One S fixed.
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
(cherry picked from commit 710e070990ac2375a1a450c2d215eb68f15139e5)
2012-09-07 17:37:31 +04:00
Andrey Pavlenko
04e9698685 possibility to maintain custom hardware-specific libs folders 2012-09-06 16:09:20 +04:00
Andrey Kamaev
f2a486c34b Fix Android samples for devices having front camera only (Nexus 7)
(cherry picked from commit 067744d07109713a7cbf1db16d831580f6d65ea3)
2012-08-31 18:29:55 +04:00
Andrey Kamaev
58baf2b455 Fix package name of Android color blob detection sample
(cherry picked from commit fc93518449b6c128766266910faea5fe72d0e69d)

Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
2012-08-31 18:28:44 +04:00
Andrey Kamaev
11bffb0e7d Unify manifest files in Android examples
(cherry picked from commit bd12f636c8afbfc22f00342438112fe068551537)

Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
2012-08-31 18:28:38 +04:00
Andrey Kamaev
ca0609dde3 Fixed java camera release in Android tutorial-0 sample
(cherry picked from commit cd59cf3ab5c37d1db53394f5143cd87f9047547f)

Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
2012-08-31 18:28:30 +04:00
Andrey Kamaev
05630b336b Updated package version in Android samples
(cherry picked from commit 47b9640785cb0fe4dce043cb676e687e74704276)

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