Andrey Kamaev [Tue, 28 Aug 2012 13:23:33 +0000 (17:23 +0400)]
Fixed java camera release in Android tutorial-0 sample
(cherry picked from commit
cd59cf3ab5c37d1db53394f5143cd87f9047547f)
Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
Andrey Kamaev [Tue, 28 Aug 2012 11:06:47 +0000 (15:06 +0400)]
Updated package version in Android samples
(cherry picked from commit
47b9640785cb0fe4dce043cb676e687e74704276)
Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
Andrey Kamaev [Fri, 24 Aug 2012 12:55:44 +0000 (16:55 +0400)]
Merge branch 'android_camera_2.4' into 2.4
Andrey Kamaev [Thu, 23 Aug 2012 15:17:51 +0000 (19:17 +0400)]
Fix/workaround bogus error in Android samples running on Android 4.1.1
Andrey Kamaev [Thu, 23 Aug 2012 12:02:33 +0000 (16:02 +0400)]
Fix crash on resume in face detection sample
Andrey Kamaev [Thu, 23 Aug 2012 10:39:10 +0000 (14:39 +0400)]
Fix formatting in detection based tracker
Andrey Kamaev [Wed, 22 Aug 2012 17:14:06 +0000 (21:14 +0400)]
Fix Andoid samples: black screen after resume problem
Andrey Kamaev [Wed, 22 Aug 2012 15:24:11 +0000 (19:24 +0400)]
Android camera: commented logs in frame callback
Andrey Kamaev [Tue, 21 Aug 2012 13:44:24 +0000 (17:44 +0400)]
Fix buffer allocation in Android camera
Andrey Kamaev [Fri, 24 Aug 2012 12:52:30 +0000 (16:52 +0400)]
Cherry pick Android-related changes from master till 2012-08-23
* service
* tutorials
* samples
* gitignore
Andrey Kamaev [Fri, 17 Aug 2012 15:23:45 +0000 (19:23 +0400)]
Fix formatting in Android tutorials
Andrey Kamaev [Fri, 17 Aug 2012 14:12:40 +0000 (18:12 +0400)]
Fixed layout in third Android tutorial
Vsevolod Glumov [Wed, 15 Aug 2012 11:10:58 +0000 (15:10 +0400)]
Reviewed 'android_dev_intro'
Andrey Pavlenko [Wed, 15 Aug 2012 08:21:58 +0000 (12:21 +0400)]
improving android tutorial v2
Andrey Pavlenko [Wed, 15 Aug 2012 07:44:54 +0000 (11:44 +0400)]
improving android tutorial v2
Andrey Pavlenko [Wed, 15 Aug 2012 06:56:50 +0000 (10:56 +0400)]
improving android tutorial v2, removing v1
Vsevolod Glumov [Wed, 15 Aug 2012 07:39:02 +0000 (11:39 +0400)]
Reviewed 'android_dev_intro' and 'O4A_SDK'
Andrey Kamaev [Tue, 14 Aug 2012 13:25:55 +0000 (17:25 +0400)]
Fixed tutorial link to NVIDIA Tegra platform
Andrey Pavlenko [Tue, 14 Aug 2012 13:17:04 +0000 (17:17 +0400)]
improving android tutorial v2
Oleg Sklyarov [Mon, 13 Aug 2012 12:03:01 +0000 (16:03 +0400)]
ubuntu screenshot png
Oleg Sklyarov [Mon, 13 Aug 2012 12:00:58 +0000 (16:00 +0400)]
Android device recognition in Ubuntu Linux manual
Vsevolod Glumov [Mon, 13 Aug 2012 12:29:00 +0000 (16:29 +0400)]
some minor fixes to the 'android_dev_intro'
Vsevolod Glumov [Mon, 13 Aug 2012 09:13:07 +0000 (13:13 +0400)]
added a short preface to the 'android_dev_intro' doc.
Andrey Pavlenko [Thu, 9 Aug 2012 18:57:06 +0000 (22:57 +0400)]
android tutorial, part 1 - adding 'device connection via usb' section, sections reordering
Oleg Sklyarov [Thu, 9 Aug 2012 14:21:56 +0000 (18:21 +0400)]
android tutorial minor layout fix (also my first test commit)
Andrey Kamaev [Wed, 8 Aug 2012 12:27:13 +0000 (16:27 +0400)]
Fixed links in formatting in Android intro tutorial
Andrey Kamaev [Tue, 7 Aug 2012 14:00:09 +0000 (18:00 +0400)]
Fix several documentation build warnings
Conflicts:
modules/gpu/doc/video.rst
modules/ocl/doc/ocl.rst
Andrey Pavlenko [Tue, 7 Aug 2012 13:27:48 +0000 (17:27 +0400)]
android tutorial v2, initial draft commit
Andrey Kamaev [Tue, 7 Aug 2012 09:29:43 +0000 (13:29 +0400)]
svn repository web references are replaced with links to git
marina.kolpakova [Mon, 6 Aug 2012 09:18:48 +0000 (13:18 +0400)]
minor in license file
Andrey Pavlenko [Tue, 31 Jul 2012 08:31:23 +0000 (12:31 +0400)]
minor update (pictures resize removed, emulator screen-shot downscaled)
Andrey Pavlenko [Tue, 24 Jul 2012 13:34:36 +0000 (17:34 +0400)]
minor updates to android tutorials
Alexander Smorkalov [Tue, 14 Aug 2012 12:59:36 +0000 (16:59 +0400)]
ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed.
Alexander Smorkalov [Tue, 14 Aug 2012 08:03:05 +0000 (12:03 +0400)]
Debug build for Android added. Stripping of debug build turned off.
Alexander Smorkalov [Tue, 31 Jul 2012 08:15:54 +0000 (12:15 +0400)]
Warning fix. ifdefs for 4.1.1 added.
Alexander Smorkalov [Tue, 31 Jul 2012 07:09:34 +0000 (11:09 +0400)]
Android 4.1.1 native camera fix. BufferQueue class is used instaed of Surface texture. Includes in cmake updated.
Alexander Smorkalov [Mon, 16 Jul 2012 07:56:12 +0000 (07:56 +0000)]
Tegra3 package support enabled;
Version code incremented;
Alexander Smorkalov [Thu, 12 Jul 2012 13:12:16 +0000 (13:12 +0000)]
Tegra detector fixed;
Some aditional logs added;
AndroidManifest version incremented.
Alexander Smorkalov [Thu, 12 Jul 2012 11:50:40 +0000 (11:50 +0000)]
HW compatibility tests added;
Arm-v7a neon package support enabled.
Alexander Smorkalov [Thu, 12 Jul 2012 08:02:41 +0000 (08:02 +0000)]
Package name logic improved;
Aditional tests added;
Some bug fixes with different __SUPPORT_XXX defines.
Alexander Smorkalov [Wed, 11 Jul 2012 13:30:41 +0000 (13:30 +0000)]
Unit tests updated. Version and HW compatiblity tests added;
Tegra3, neon, sseX, x64 support uncomment and guarded by ifdefs
Daniil Osokin [Fri, 10 Aug 2012 13:32:29 +0000 (17:32 +0400)]
Add ignore for *.user files
Andrey Kamaev [Mon, 6 Aug 2012 11:48:31 +0000 (15:48 +0400)]
Added ignore for tbb source tarballs
Vadim Pisarevsky [Thu, 26 Jul 2012 13:11:00 +0000 (17:11 +0400)]
added gitignore to filter out certain temporary files
Andrey Pavlenko [Wed, 8 Aug 2012 12:39:24 +0000 (16:39 +0400)]
duplicating cv::error() message to Android logcat
Andrey Pavlenko [Tue, 31 Jul 2012 11:22:58 +0000 (15:22 +0400)]
Tegra3 package support enabled; Service version code incremented.
Android 4.1.1 native camera fix (shared libraries for native Android camera updated).
Andrey Pavlenko [Mon, 30 Jul 2012 06:39:59 +0000 (10:39 +0400)]
updating URL to Android info start page
Andrey Pavlenko [Tue, 24 Jul 2012 09:13:21 +0000 (13:13 +0400)]
updating README content
marina.kolpakova [Wed, 25 Jul 2012 08:19:08 +0000 (12:19 +0400)]
fixed surf for upright case
Maria Dimashova [Tue, 17 Jul 2012 14:24:54 +0000 (14:24 +0000)]
merged with r9002 (fix for SURF descriptor)
Andrey Pavlenko [Sun, 15 Jul 2012 13:20:38 +0000 (13:20 +0000)]
merging r9039-9040,9044 from trunk (warnings and message in Java)
Marina Kolpakova [Fri, 13 Jul 2012 14:27:09 +0000 (14:27 +0000)]
merged documentation and android service from trunk
Vincent Rabaud [Thu, 12 Jul 2012 16:04:51 +0000 (16:04 +0000)]
backport 9018
Vincent Rabaud [Tue, 10 Jul 2012 19:09:25 +0000 (19:09 +0000)]
backoprt 8987
Alexander Smorkalov [Wed, 4 Jul 2012 09:55:00 +0000 (09:55 +0000)]
Messages updated. Samples rebuild is needed.
Marina Kolpakova [Tue, 3 Jul 2012 16:16:24 +0000 (16:16 +0000)]
merged GPU resize became same as CPU implementation
Alexander Shishkov [Tue, 3 Jul 2012 15:55:39 +0000 (15:55 +0000)]
updated pdfs to 2.4.2
Alexander Shishkov [Tue, 3 Jul 2012 15:31:13 +0000 (15:31 +0000)]
updated docs theme
Kirill Kornyakov [Tue, 3 Jul 2012 15:10:40 +0000 (15:10 +0000)]
minor fixes for the second Android tutorial
Andrey Pavlenko [Tue, 3 Jul 2012 15:07:20 +0000 (15:07 +0000)]
updating pictures; removing redundant 'fix prj prop-s' step
Kirill Kornyakov [Tue, 3 Jul 2012 14:13:05 +0000 (14:13 +0000)]
minor fixes for the first Android tutorial
Alexander Smorkalov [Tue, 3 Jul 2012 13:40:30 +0000 (13:40 +0000)]
Library name updated.
Alexander Smorkalov [Tue, 3 Jul 2012 13:31:15 +0000 (13:31 +0000)]
Touchscreen requirement turned off.
Alexander Smorkalov [Tue, 3 Jul 2012 13:18:22 +0000 (13:18 +0000)]
Package name pattern changed.
Kirill Kornyakov [Tue, 3 Jul 2012 13:16:22 +0000 (13:16 +0000)]
renamed google group to the OpenCV4Android instead of android-opencv
Andrey Pavlenko [Tue, 3 Jul 2012 13:15:41 +0000 (13:15 +0000)]
install bin.apk
Alexander Smorkalov [Tue, 3 Jul 2012 13:04:40 +0000 (13:04 +0000)]
About message updated.
Version updated.
Alexander Smorkalov [Tue, 3 Jul 2012 13:03:38 +0000 (13:03 +0000)]
Message box text updated.
Alexander Smorkalov [Tue, 3 Jul 2012 12:56:53 +0000 (12:56 +0000)]
Icon for binary package updated.
Andrey Pavlenko [Tue, 3 Jul 2012 12:50:36 +0000 (12:50 +0000)]
removing windows-specific path from includes
Andrey Kamaev [Tue, 3 Jul 2012 12:44:32 +0000 (12:44 +0000)]
Fixed Java API tests
Andrey Kamaev [Tue, 3 Jul 2012 12:02:58 +0000 (12:02 +0000)]
Fixed code block in android tutorial
Andrey Kamaev [Tue, 3 Jul 2012 11:52:54 +0000 (11:52 +0000)]
Merged the trunk r8927, r8929
Alexander Smorkalov [Tue, 3 Jul 2012 09:19:04 +0000 (09:19 +0000)]
Internal docs about service were moved to opencv_extra.
Alexander Smorkalov [Tue, 3 Jul 2012 09:14:54 +0000 (09:14 +0000)]
Icon for OpenCV Manager updated.
Andrey Pavlenko [Tue, 3 Jul 2012 08:38:34 +0000 (08:38 +0000)]
starting 2.4.2 O4A packages will be packed with ZIP instead of TAR.BZ2
Alexander Smorkalov [Tue, 3 Jul 2012 08:12:27 +0000 (08:12 +0000)]
Typo fix.
Alexander Smorkalov [Tue, 3 Jul 2012 07:58:48 +0000 (07:58 +0000)]
OpenCV 2.4.0 constant version removed. All docs and samples updated for 2.4.2.
Andrey Kamaev [Mon, 2 Jul 2012 21:39:17 +0000 (21:39 +0000)]
Documentation: fixed duplicated appendix reference
Andrey Kamaev [Mon, 2 Jul 2012 21:12:45 +0000 (21:12 +0000)]
Merged the trunk r8917:8919
Andrey Kamaev [Mon, 2 Jul 2012 15:40:18 +0000 (15:40 +0000)]
Fixed several opencv version references
Andrey Kamaev [Mon, 2 Jul 2012 15:15:40 +0000 (15:15 +0000)]
Merged the trunk r8913
Andrey Kamaev [Mon, 2 Jul 2012 14:21:51 +0000 (14:21 +0000)]
Merged the trunk r8911
Alexander Smorkalov [Mon, 2 Jul 2012 14:19:14 +0000 (14:19 +0000)]
Application start without service fixed.
Andrey Kamaev [Mon, 2 Jul 2012 14:12:34 +0000 (14:12 +0000)]
Merged the trunk r8907, r8908
Andrey Kamaev [Mon, 2 Jul 2012 13:46:47 +0000 (13:46 +0000)]
Merged the trunk r8901:8904
Alexander Smorkalov [Mon, 2 Jul 2012 13:39:55 +0000 (13:39 +0000)]
Typo fix. Name of native library was inconsists with java loadLibrary
Andrey Kamaev [Mon, 2 Jul 2012 13:06:28 +0000 (13:06 +0000)]
Merged the trunk 8892,8894,8898
Alexander Shishkov [Mon, 2 Jul 2012 12:57:52 +0000 (12:57 +0000)]
update FFMPEG wrapper binaries
Andrey Kamaev [Mon, 2 Jul 2012 12:33:37 +0000 (12:33 +0000)]
Merged the trunk r8887, r8891, r8314
Andrey Kamaev [Mon, 2 Jul 2012 12:10:13 +0000 (12:10 +0000)]
Version number is adjusted to 2.4.2
Andrey Kamaev [Mon, 2 Jul 2012 12:05:06 +0000 (12:05 +0000)]
Merged the trunk 8855,8885,8886
Andrey Kamaev [Mon, 2 Jul 2012 11:48:16 +0000 (11:48 +0000)]
Merged facerec from the trunk
Andrey Kamaev [Mon, 2 Jul 2012 11:04:43 +0000 (11:04 +0000)]
Merged the trunk r8852:8880
Marina Kolpakova [Sat, 30 Jun 2012 09:37:40 +0000 (09:37 +0000)]
fixed #2113
Andrey Kamaev [Fri, 29 Jun 2012 07:52:34 +0000 (07:52 +0000)]
Merged recent changes from trunk - 8833,8848,8850
Andrey Kamaev [Thu, 28 Jun 2012 19:32:32 +0000 (19:32 +0000)]
Merged Android build fix
Andrey Kamaev [Thu, 28 Jun 2012 18:11:54 +0000 (18:11 +0000)]
Fixed few warnings
Marina Kolpakova [Thu, 28 Jun 2012 17:54:08 +0000 (17:54 +0000)]
fixed merge problem
Andrey Kamaev [Thu, 28 Jun 2012 17:48:53 +0000 (17:48 +0000)]
Reverted some changes in videostab module