generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,356 Commits 3 Branches 47 Tags
473ca0849d
Commit Graph

80 Commits

Author SHA1 Message Date
Roman Donchenko
c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
 2013-07-08 18:47:38 +04:00
Alexander Smorkalov
e905c81ccc OpenCV Manager version++. 2013-07-05 12:07:04 +04:00
Roman Donchenko
4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp
 2013-07-03 19:53:21 +04:00
Kirill Kornyakov
0339dd51f1 Removed all references to trunk 2013-06-28 12:38:44 +04:00
Alexander Smorkalov
e241c14b94 OpenCV Library and Manager version incremented. 
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
 2013-06-27 12:05:25 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Alexander Smorkalov
1e332d690f OpenCV verison incremented 
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
 2013-04-04 15:50:36 +04:00
Andrey Kamaev
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +04:00
Andrey Pavlenko
07b1ccdeb0 removing redundant picture resize 2013-03-01 13:56:50 +04:00
Andrey Pavlenko
978132edc1 minor Android tutorial fixes 2013-03-01 13:52:14 +04:00
Andrey Kamaev
891d7da6ee Merge branch '2.4' 2013-02-28 11:17:06 +04:00
Alexander Smorkalov
8458f5c489 Android tutorial updated 
OpenCV version incremented;
New CvCameraViewListener interface description added.
 2013-02-26 16:35:02 +04:00
Andrey Kamaev
637397f621 Merge branch '2.4' 2013-02-20 12:31:16 +04:00
Andrey Kamaev
0570aa6494 Avoid problem of old sphinx reporting an error on lines starting from : 
See http://sourceforge.net/tracker/?func=detail&aid=3484857&group_id=38414&atid=422030
 2013-02-19 10:34:43 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Alexander Smorkalov
c7e7b77093 Tutorial for Android synchronized with actual application framework. 2013-02-08 16:53:06 +04:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Vsevolod Glumov
c0411caef4 Fixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'. 2012-12-28 16:37:05 +04:00
Andrey Kamaev
132b5d6435 Merge release 2.4.3.2 2012-12-25 19:07:08 +04:00
Andrey Pavlenko
1e5b533d01 updating tutorial 2012-12-24 20:05:27 +04:00
Andrey Pavlenko
99299b3605 updating tutorial 2012-12-24 19:25:42 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Vsevolod Glumov
e9e46d3086 Updated Android introductory tutorials, based on frequent Q&A questions/issues. 2012-12-21 16:10:20 +04:00
Alexander Smorkalov
3c09b075fc OpenCV Manager selection chapter added to documentation. 2012-12-18 18:34:51 +04:00
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
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 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
Andrey Kamaev
6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
Alexander Smorkalov
306ed9801a Issue 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
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