Commit Graph

339 Commits

Author SHA1 Message Date
Jacob MacRitchie
8f05af8d05 Fixed my additions. For real this time. I think.
Oops. Hopefully it works this time.
2017-09-24 05:58:22 -03:00
Raymond Kirk
4059f8b3a3 Fix 'directory does not exist' in windows tutorial 2017-09-21 16:46:58 +01:00
LaurentBerger
82ad0749af add pushd popd 2017-08-31 19:25:53 +02:00
LaurentBerger
3e9a659f4c Another way to build opencv
update

add anchor
2017-08-31 08:45:18 +02:00
Alexander Alekhin
d195f2775a cmake: change Pylint integration 2017-08-24 14:59:33 +03:00
tribta
b7fa6d84bc Using Pylint Tool to Test the python tutorial codes
* Adding CMake script to check if pylint is installed
* Adding Pylint config file (to choose the tests that are enabled)
* Adding CMake script to samples/python/tutorial_code

Testing: bad-indentation, mixed-indentation, unnecessary-semicolon, unused-variable
2017-08-24 14:58:48 +03:00
lewisjb
47c9bb7ba8 Update doc build instructions for doxygen 2017-06-11 00:00:45 +10:00
Drew Hintz
f6b6fbf136 change tutorial to use enum name instead of value (#8783)
* change tutorial to use enum name instead of value

* use enum name instead of value
2017-05-25 12:10:13 +03:00
vskarlsruhe
0bc30d382d Merge pull request #8752 from vskarlsruhe:patch-7
Update windows_install.markdown (#8752)
2017-05-22 16:44:23 +03:00
Drew Hintz
aea846ad96 Update broken downloads link in documentation (#8764)
* Update broken downloads link

* Update broken downloads link

* Update broken downloads link
2017-05-22 12:37:58 +03:00
Adeel Ahmad
bc7f6fc44c Merge pull request #8253 from adl1995:master
* Update linux_install.markdown

Grammar improvements, fixed typos.

* Update tutorials.markdown

Improvements in grammar.

* Update table_of_content_calib3d.markdown

* Update camera_calibration_square_chess.markdown

Improvements in grammar. Added answer.

* Update tutorials.markdown

* Update erosion_dilatation.markdown

* Update table_of_content_imgproc.markdown

* Update warp_affine.markdown

* Update camera_calibration_square_chess.markdown

Removed extra space.

* Update gpu_basics_similarity.markdown

Grammatical improvements, fixed typos.

* Update trackbar.markdown

Improvement for better understanding.
2017-03-01 18:44:34 +00:00
Maksim Shabunin
66cdc10010 Minor documentation fixes:
- disabled OPTIMIZE_OUTPUT_JAVA
- filtered out *.m scripts
- removed link to old Sphinx documentation
- replaced all mentions of Sphinx with Doxygen
2017-01-18 13:32:20 +03:00
Bryce Evans
a85b4b5805 Merge pull request #7942 from bae43:fix-typos
Fix Documentation Typos (#7942)
2017-01-03 03:00:12 +00:00
Cartucho
fcddfa4f86 GSoC 2016 - Adding ALIASES for tutorial (#7041)
* GSoC 2016 - Adding toggle files to be used by tutorials.

Add a toggle option for tutorials.
* adds a button on the HTML tutorial pages to switch between blocks
* the default option is for languages: one can write a block
for C++ and another one for Python without re-writing the tutorial

Add aliases to the doxyfile.
* adding alises to make a link to previous and next tutorial.
* adding alias to specify the toggle options in the tutorials index.
* adding alias to add a youtube video directly from link.

Add a sample tutorial (mat_mask_opertaions) using the developed aliases:
* youtube alias
* previous and next tutorial alias
* buttons
* languages info for tutorial table of content
* code referances with snippets (and associated sample code files)

* Removing the automatic ordering.
Adding specific toggles for cpp, java and python.
Move all the code to the footer / header and Doxyfile.
Updating documentation.
2016-12-15 15:32:12 +03:00
Maksim Shabunin
daa97021bd Merge pull request #7810 from parismita:patch-1 2016-12-14 14:54:53 +00:00
Randy J. Ray
dd99b7c1cb Further editing/refinement of the tutorial.
This is based on testing OpenCV 3.1 with VisionWorks, which identified issues.
The tutorial now specifies 3 cherry-pick commands for opencv.
2016-12-13 10:54:10 -08:00
parismita
f55e966210 Update linux_install.markdown
Update linux_install.markdown

Update linux_install.markdown

Update linux_install.markdown

Update linux_install.markdown

Update linux_install.markdown

Update linux_install.markdown
2016-12-09 23:04:54 +05:30
Randy J. Ray
036dd8d48f Contribute a tutorial on building for NVIDIA Tegra (#7814)
* Contribute a tutorial on building for NVIDIA Tegra

* Clean-up and fixes based on feedback.
2016-12-08 11:50:59 +03:00
StevenPuttemans
e1b4f5aeb6 fix issue 7352 2016-09-29 14:59:43 +02:00
Tomoaki Teshima
531b8e2320 add note of minimum requirement of CUDA 2016-07-22 07:04:37 +09:00
Alexander Alekhin
ddc0b42bc3 migration: github.com/opencv/opencv 2016-07-12 12:51:12 +03:00
Maksim Shabunin
50edaae06c Merge pull request #6322 from berak:fix_linux_eclipse_tutorial 2016-03-25 07:39:19 +00:00
berak
0b389b24f6 fix changed libraries in eclipse tutorial 2016-03-24 16:09:14 +01:00
renu285
45f9d32866 Removed older libraries pointing to 2.4 in eclipse tutorial docs 2016-03-14 12:09:56 +01:00
shruthikashyap
d64b35f11d Fix for issue 6146 and some grammar corrections 2016-02-27 23:26:23 +01:00
shruthikashyap
23ba94140e Fix for issue 6146 2016-02-27 23:16:52 +01:00
Andrey Pavlenko
58e5aca631 Android camera + OpenCL tutorial (for existing code at samples/android/tutorial-4-opencl) 2015-08-20 15:13:34 +03:00
Maksim Shabunin
caffbaafbe Updated Manager for Android 2015-06-02 17:33:04 +03:00
Maksim Shabunin
55d1f0b7d6 Transition guide: removed one of the version check methods 2015-05-25 18:05:20 +03:00
Maksim Shabunin
44d1738d47 Transition guide: how to check library version 2015-05-22 18:46:16 +03:00
Maksim Shabunin
6d1cbc6458 Reorganized user guide 2015-05-13 18:46:21 +03:00
Vadim Pisarevsky
4af2eb22ab Merge pull request #3974 from StevenPuttemans:fix_RGB_naming_master 2015-05-12 15:12:27 +00:00
Maksim Shabunin
4bf6bd3d37 Merge pull request #3972 from PhilLab:docLineno 2015-05-04 09:48:07 +00:00
StevenPuttemans
34dacdea32 fixing all RGB instances to BGR where needed 2015-05-04 09:02:46 +02:00
Philipp Hasper
dadf53f17c Doxygen: replaced @includelineno by @include to enable copy-pasting 2015-04-29 09:31:53 +02:00
Samed Ozdemir
5e44aa37ff Fixed a typo, "requited" -> "required" 2015-04-27 23:00:39 -04:00
Philipp Hasper
0b20ce696a Fixed markdown: **Note** -> @note 2015-04-22 08:08:10 +02:00
Maksim Shabunin
b80142be69 Fix an issue in cmake tutorial 2015-04-16 17:52:00 +03:00
Maksim Shabunin
fab51ac0af Removed blank line at EOF 2015-03-19 13:34:19 +03:00
Maksim Shabunin
4d7d354498 Added to TOC 2015-03-19 13:18:10 +03:00
Maksim Shabunin
8779d029b2 Added transition (from 2.4) guide 2015-03-19 13:15:08 +03:00
mariadeanton
191336de97 Added biicode docs to introduction tutorials
biicode docs added with fixes
fixed biicode docs

added biicode docs
added biicode docs

fixed #include typos

fixed whitespaces and tabs in indent

fixed whitespaces

small fixes

fixed trailing whitespace

trial fix #includes

fixed #includes

fixed link and branch name
2015-02-25 16:43:23 +01:00
Maksim Shabunin
b4050c775e Updated sample files documentation inclusions 2014-12-26 19:17:18 +03:00
Maksim Shabunin
ad6a80f68c Moved tutorial table-of-contents files to corresponding root level 2014-12-26 19:17:14 +03:00
Maksim Shabunin
d01bedbc61 Removed Sphinx documentation files 2014-12-26 19:12:19 +03:00
Maksim Shabunin
06c2a70c49 Fixed some mistakes 2014-12-22 17:21:37 +03:00
Maksim Shabunin
637b615e08 Tutorial: documenting OpenCV 2014-12-22 15:51:37 +03:00
Maksim Shabunin
36a04ef8de Doxygen tutorials: cpp done 2014-12-01 16:05:38 +03:00
Maksim Shabunin
c5536534d8 Doxygen tutorials: warnings cleared 2014-12-01 16:05:38 +03:00
Maksim Shabunin
8375182e34 Doxygen tutorials: basic structure 2014-12-01 16:05:37 +03:00
Maksim Shabunin
220f671655 Doxygen tutorials: some fixes in RST-docs 2014-12-01 16:05:37 +03:00
Dmitriy Anisimov
28944336d4 updated linux installation documentation 2014-11-14 12:32:42 +03:00
Vadim Pisarevsky
c91b0e7ac4 Merge pull request #3217 from avdmitry:samples_cpp_data 2014-11-05 14:57:46 +00:00
micha137
67b2380d19 Update table_of_content_introduction.rst 2014-10-13 16:31:37 +02:00
berak
7cb3f3def7 change remaining c-api CV_ prefixes in constants 2014-10-04 14:10:12 +02:00
Dmitriy Anisimov
71348651eb fixed display_image tutorial sample 2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
55c799a474 fixed warnings in documents 2014-09-23 07:45:52 +04:00
Vadim Pisarevsky
46718cae28 Merge pull request #3209 from PhilLab:patch-5 2014-09-14 18:47:21 +00:00
Maksim Shabunin
88aea1d52f Stripped iCCP chunk from png files 2014-09-12 16:30:23 +04:00
Philipp Hasper
ac206ccb05 Visual Studio tutorial: updated library names 2014-09-10 19:12:06 +02:00
Vadim Pisarevsky
00b2124876 fixing more compile problems with Java bindings etc 2014-08-14 13:48:52 +04:00
Roman Donchenko
983e75e5de Merge remote-tracking branch 'origin/master' into merge-2.4 2014-08-01 15:01:41 +04:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Roman Donchenko
a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Neo Alienson
b6e25a9fc7 Fix typos 2014-06-16 18:48:10 +08:00
Roman Donchenko
659d21332e Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/spinimages.cpp
2014-06-09 18:03:03 +04:00
StevenPuttemans
7c44a07810 fix typo in linux tutorial 2014-06-02 09:35:19 +02:00
Roman Donchenko
3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
StevenPuttemans
1d557e6702 adding bugfix 3549 2014-05-13 15:34:30 +02:00
Roman Donchenko
313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/arithm.cpp
	modules/imgproc/src/imgwarp.cpp
	modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
StevenPuttemans
a9c7db7518 add suggestion of feature 2619 2014-05-09 13:44:12 +02:00
StevenPuttemans
99475e2976 fixed wrong download link in tutorial 2014-05-08 10:45:51 +02:00
PhilLab
897d0a9aaf Updated documentation: library names
updated the library names to OpenCV version 2.4.9
2014-05-05 12:16:48 +02:00
Andrey Pavlenko
9ec823d800 Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert 2014-04-08 11:05:30 +04:00
Roman Donchenko
4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
Elena Gvozdeva
037ac27ec8 Added SharedMatrix 2014-04-03 14:53:27 +04:00
Alexander Smorkalov
e23f7303a6 OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07:00
Roman Donchenko
f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Daniil Osokin
ac19420907 Removed obsolete list from docs 2014-03-24 14:50:20 +01:00
Daniil Osokin
2d3aa3861c Fixed Load, Modify, and Save an Image tutorial 2014-03-21 16:58:50 +01:00
Kang Liu
dc21e2cc0e remove highlighting in some function links
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
2014-03-21 11:54:35 +01:00
Roman Donchenko
db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Roman Donchenko
af8aa8a2fa Merge pull request #2433 from ilya-lavrenov:typos 2014-03-03 12:20:35 +04:00
Ilya Lavrenov
eedf86402d typos 2014-03-02 21:04:17 +04:00
Roman Donchenko
48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Roman Donchenko
689589ebaa Merge pull request #2365 from yashdv:image_tutorial_doc_bug 2014-02-18 11:58:11 +04:00
Roman Donchenko
13182da945 Merge pull request #2363 from alekcac:introduction_tut_fix 2014-02-18 11:56:57 +04:00
yash
017a282c7a Minor error in the documentation Load and Save Image 2014-02-18 10:34:58 +05:30
Alexander Shishkov
a8eab26bae fixed incorrect code in introduction tutorial 2014-02-17 18:10:08 +04:00
Roman Donchenko
029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
yash
e2f5001b11 fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst 2014-02-14 23:04:03 +05:30
Rohit Girdhar
01b624e359 -j8 in linux_installation tutorial 2014-02-13 13:52:00 +05:30
Elliot Godzich
2806679781 Updated DisplayImage.cpp program to compile
CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
2014-02-11 21:46:14 -08:00
Roman Donchenko
dad536f490 Merge pull request #1851 from dneelyep:patch-1 2014-02-11 16:46:35 +04:00
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Andrey Pavlenko
dca5684145 removing duplicated legacy license, the actual instance is in 'opencv/LICENSE' 2014-01-23 17:05:20 +04:00
Roman Donchenko
ee331001f5 Merge pull request #2161 from SpecLad:doc-req 2014-01-22 12:04:48 +04:00
Roman Donchenko
a502ffbd2c Updated required CMake version in docs to match reality. 2014-01-17 14:50:40 +04:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00