Commit Graph

93 Commits

Author SHA1 Message Date
Andrey Kamaev e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Vsevolod Glumov 0711e65972 Added a note to the android_dev_intro.rst. 2012-11-27 15:10:57 +04:00
Andrey Kamaev 0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Alexander Smorkalov 6fb959710d Code review comments applied. 2012-11-12 18:01:56 +04:00
mikle 7ef378b230 Android tutorial updated. HelloWorld sample ported on new framework. 2012-11-08 14:51:42 +04:00
Andrey Kamaev 4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Pavlenko 65c6b81cbc Android Tutorial update (TADP link, Android SDK platforms, CDT) 2012-11-02 16:11:08 +04:00
Kirill Kornyakov 2b7d65d078 Updated OpenCV4Android SDK tutorial 2012-11-01 22:28:46 +04:00
Kirill Kornyakov 61ed591728 Updated Introduction into Android Development tutorial 2012-11-01 22:28:46 +04:00
Vadim Pisarevsky 849a8c8d20 fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
Andrey Kamaev 91f47d2779 Merge branch '2.4'
Conflicts:
	modules/core/include/opencv2/core/version.hpp
2012-10-23 20:39:02 +04:00
Andrey Kamaev 6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
Andrey Kamaev 0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
OpenCV Buildbot 81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot 04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Kirill Kornyakov aedf56404e made imread description slightly better #2406 2012-10-15 15:23:38 +04:00
Vsevolod Glumov a2088d0c52 Replaced SVN instructions with Git ones for 'Installation in Windows' section (Issue #2249); Also, fixed both bugs from issue #2374 in the same section. 2012-10-11 18:37:00 +04:00
Vsevolod Glumov a3080636ba Replaced SVN instructions with Git instructions in iOS and Linux installation tutorials. Issue #2249
+ Minor formatting fixes.
2012-10-11 16:44:53 +04:00
Alexander Smorkalov 306ed9801a Issue #2284 BaseLoaderCallback requires use of Activity fixed. 2012-10-10 11:44:01 +04:00
Alexander Smorkalov 9a76573172 Auto expand of OpenCV version for Android Library prject and some documentation pages added. 2012-10-09 18:30:58 +04:00
Alexander Smorkalov 9ab19691d4 OpenCV Manager documentation updated.
Diagram rendering script updated.
2012-10-09 10:34:40 +04:00
Vadim Pisarevsky 3d4ca2d709 added ios tutorials by Charu Hans and Eduard Feicho 2012-08-30 15:49:53 +04:00
Andrey Kamaev bf4c1df0d0 Fix formatting in Android tutorials 2012-08-17 19:23:45 +04:00
Andrey Kamaev 9d6ccecfdd Fixed layout in third Android tutorial 2012-08-17 18:15:15 +04:00
Vsevolod Glumov 8899835886 Reviewed 'android_dev_intro' 2012-08-15 15:10:58 +04:00
Andrey Pavlenko 3b07e977a9 improving android tutorial v2 2012-08-15 12:21:58 +04:00
Andrey Pavlenko 6e07a1346c improving android tutorial v2 2012-08-15 11:47:48 +04:00
Vsevolod Glumov a4392e4906 Merge remote-tracking branch 'origin/master' 2012-08-15 11:39:54 +04:00
Vsevolod Glumov 5825c60491 Reviewed 'android_dev_intro' and 'O4A_SDK' 2012-08-15 11:39:02 +04:00
Andrey Pavlenko c004df234f improving android tutorial v2, removing v1 2012-08-15 10:56:50 +04:00
Andrey Kamaev d861063159 Fixed tutorial link to NVIDIA Tegra platform 2012-08-14 17:26:00 +04:00
Andrey Pavlenko 37740fa30e improving android tutorial v2 2012-08-14 17:18:24 +04:00
Vsevolod Glumov 2a1e8e3efd Merge remote-tracking branch 'origin/master' 2012-08-13 16:29:08 +04:00
Vsevolod Glumov 27212fdafe some minor fixes to the 'android_dev_intro' 2012-08-13 16:29:00 +04:00
Oleg Sklyarov 85351389f4 ubuntu screenshot png 2012-08-13 16:03:01 +04:00
Oleg Sklyarov 3b70fc6d32 Android device recognition in Ubuntu Linux manual 2012-08-13 16:00:58 +04:00
Vsevolod Glumov 87737c20c1 added a short preface to the 'android_dev_intro' doc. 2012-08-13 13:13:07 +04:00
Andrey Pavlenko a682ee40ad android tutorial, part 1 - adding 'device connection via usb' section, sections reordering 2012-08-09 22:57:06 +04:00
Oleg Sklyarov 3f68e5bb0e android tutorial minor layout fix (also my first test commit) 2012-08-09 18:21:56 +04:00
Andrey Kamaev 73f720d470 Fixed links in formatting in Android intro tutorial 2012-08-08 16:28:12 +04:00
Andrey Kamaev 8aa2d6cddc Fix several documentation build warnings 2012-08-07 18:00:09 +04:00
Andrey Pavlenko c1571e21ff android tutorial v2, initial draft commit 2012-08-07 17:27:48 +04:00
Andrey Kamaev 5100ca7508 svn repository web references are replaced with links to git 2012-08-07 14:30:36 +04:00
Andrey Pavlenko 484e83a9b6 minor update (pictures resize removed, emulator screen-shot downscaled) 2012-07-31 12:31:23 +04:00
Andrey Pavlenko e1c7bcab3a minor updates to android tutorials 2012-07-24 19:04:38 +04:00
Andrey Pavlenko 06a4553a4f minor upd. (formatting and wording) 2012-07-12 09:21:36 +00:00
Andrey Pavlenko f6a4350ddd updating wording and initDebug() descr 2012-07-12 09:21:32 +00:00
Andrey Kamaev 51f6127e0a Merged the recent fixes from 2.4 branch 2012-07-04 08:04:31 +00:00
Andrey Kamaev a4ec89fb2c Merged version references fix 2012-07-02 15:41:14 +00:00
Andrey Pavlenko eaddfb32de updating tutorial 2012-07-02 14:10:06 +00:00