1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 06:43:01 +04:00
Commit Graph

207 Commits

Author SHA1 Message Date
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 dddd285d3b Merge branch 2.4 2013-02-24 20:16:53 +04:00
NCBee 7249457771 Update doc/tutorials/core/adding_images/adding_images.rst
Quick fix for: http://code.opencv.org/issues/2803
2013-02-23 10:28:24 -05: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
Andrey Kamaev a370404d9c Merge pull request #416 from asmaloney:mat-docs-cleanup 2013-02-11 18:51:03 +04:00
Alexander Smorkalov c7e7b77093 Tutorial for Android synchronized with actual application framework. 2013-02-08 16:53:06 +04:00
Andy Maloney e7ea90f87f Mat tutorial - grammar and spelling fixes 2013-02-01 23:39:40 -05: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
Andrey Kamaev d7874238f6 Merge pull request #369 from asmorkalov:corner_detection_tutorial 2013-01-30 14:41:56 +04:00
Alexander Smorkalov 627b441022 Bugfix #2532 patch 4 corner detection sample possible bug solved.
Tutorial text was not consistent with tutorial source code in samples directory.
Inline source code was replaced on "includeliteral" directive with link to cpp file.
2013-01-30 13:05:57 +04:00
Andrey Kamaev 7e5f877ad9 Merge pull request #364 from Daniil-Osokin:bugfix_doc_features2d_tutorial 2013-01-30 13:05:47 +04:00
Daniil Osokin 7305f955a5 Added nonfree header in "Feature description" tutorial code sample (bug #2527) 2013-01-30 11:07:09 +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 dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +04:00
Andrey Kamaev 7341eaa654 Merge pull request #296 from asmorkalov:html_docs_warning_fix 2013-01-16 16:44:13 +04:00
Andrey Kamaev b362d47d95 Fix documentation build with Sphinx 1.07 2013-01-16 12:43:12 +04:00
Alexander Smorkalov 8cb0343f4c Documentation build warning fixes.
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +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 #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
Vsevolod Glumov 3f417f1ec3 Fixes for issues #2570, #2492, #2559, #2489, #2592. 2012-12-14 10:49: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
Vadim Pisarevsky 70c409f0e8 fixed building PDFs in master 2012-11-26 20:40:45 +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