 Andrey Kamaev
|
9b7dfd677d
|
Merge branch '2.4'
|
2013-03-11 18:50:19 +04:00 |
|
|
Andrey Pavlenko
|
de3767df0a
|
minor formatting
|
2013-03-06 12:59:38 +04:00 |
|
|
Andrey Pavlenko
|
aaefd31844
|
more formatting
|
2013-03-05 19:03:36 +04:00 |
|
|
Andrey Pavlenko
|
23fb570cbd
|
updating JNI lib location for Unix; formatting update
|
2013-03-05 18:42:14 +04:00 |
|
|
Andrey Kamaev
|
9e12b7c3c2
|
Merge release 2.4.4
|
2013-03-04 19:43:49 +04:00 |
|
|
cuda-geek
|
a706de2446
|
Merge pull request #601 from apavlenko:android_tutorial_update
|
2013-03-01 16:09:25 +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 Pavlenko
|
af2552d72c
|
fixing issues from http://www.code.opencv.org/issues/2807
|
2013-02-28 19:11:24 +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
|
0b8a6da817
|
Merge branch '2.4'
|
2013-02-22 17:33:30 +04:00 |
|
|
Andrey Kamaev
|
dfbd5f6a02
|
Merge pull request #506 from asmorkalov:crosscompile_tutorial
|
2013-02-22 16:41:16 +04:00 |
|
|
Andrey Kamaev
|
11bd936f0b
|
Fix warnings from documentation build
|
2013-02-20 15:07:13 +04:00 |
|
|
Alexander Smorkalov
|
637b48eec8
|
Tutorial for ARM Linux cross compilation added.
|
2013-02-20 12:48:30 +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
|
262fc929aa
|
Merge branch '2.4'
|
2013-02-18 15:35:42 +04:00 |
|
|
Andrey Kamaev
|
7e5eee5bf1
|
Merge pull request #301 from emchristiansen:javasample2.4
|
2013-02-15 18:38:25 +04:00 |
|
|
Andrey Pavlenko
|
edb15dee3d
|
review feed-back considered
|
2013-02-15 16:33:13 +04:00 |
|
|
Andrey Pavlenko
|
a8c2fc6908
|
changing layout, adding ant and eclipse sections, more pictures
|
2013-02-14 17:54:37 +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
|
61079547f0
|
Merge branch '2.4'
|
2013-02-01 14:59:40 +04:00 |
|
|
Andrey Kamaev
|
acb2cb5bf0
|
Merge pull request #389 from Daniil-Osokin:bugfix_doc_opencv_with_cmake
|
2013-01-31 15:04:56 +04:00 |
|
|
Daniil Osokin
|
b5ed86c6a1
|
Fixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug #2663, #2588)
|
2013-01-31 13:26:29 +04:00 |
|
|
Andrey Kamaev
|
7572b4d400
|
Merge branch '2.4'
|
2013-01-30 15:12:50 +04:00 |
|
|
Daniil Osokin
|
568591670c
|
Fixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug #2739)
|
2013-01-30 08:16:47 +04:00 |
|
|
Andrey Kamaev
|
0734d9b877
|
Merge branch '2.4'
|
2013-01-29 14:16:07 +04:00 |
|
|
Daniil Osokin
|
f9bff103dd
|
Removed obsolete steps from Windows installation tutorial (bug #2550)
|
2013-01-28 17:46:03 +04:00 |
|
|
Eric Christiansen
|
c2c2403a79
|
Added a desktop Java tutorial
|
2013-01-21 14:57:25 -08: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 #2
|
2012-12-24 20:05:27 +04:00 |
|
|
Andrey Pavlenko
|
99299b3605
|
updating tutorial #1
|
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 |
|
|
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 |
|