Alexander Alekhin
7600757d07
Merge pull request #6181 from delftswa2016:fix-for-issue-6146
2016-02-29 15:13:39 +00: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
Maksim Shabunin
8c29380471
Merge pull request #6105 from mshabunin:tutorial-folder-correction
2016-02-15 13:10:45 +00:00
Maksim Shabunin
6c0c0466c6
Tutorials: moved Megamind.avi files to samples/data folder
2016-02-12 13:44:14 +03:00
Maksim Shabunin
359acc0d33
Tutorials: moved imgcodecs and videoio tutorials to separate pages
2016-02-12 13:35:46 +03:00
Ishank gulati
5312db93b4
added equality
2016-01-17 09:46:23 +05:30
Ishank gulati
24da1ba3dc
added videoio docs and tutorials
2015-12-26 10:48:01 +05:30
Vadim Pisarevsky
c4edd86aeb
Merge pull request #5400 from dtmoodie:thrust_tutorial
2015-11-23 18:36:42 +00:00
Dan Moodie
7376c5311b
Fixed tabs in whitespace.
2015-09-24 14:29:17 -04:00
Alexander Alekhin
7d7f5c196d
Merge pull request #5295 from LorenaGdL:ml-svm_tutorials
2015-09-24 14:13:07 +00:00
Dan
23fc5930b7
Improved thrust interop tutorial.
2015-09-24 09:32:38 -04:00
Lorena García
f034320731
Change in links
...
Explicit link to 2.4 docs
2015-09-03 18:16:29 +02:00
Lorena García
c1392f64a4
ml_svm_tutorials version note added
...
Added note to point out code is for version 3.0 despite compatibility of
tutorial > version 2.0
2015-09-03 07:38:25 +02: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
Maksim Shabunin
c8cb03fd8f
Replaced 'corrected' to 'distorted' in camera calibration tutorials
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
Vadim Pisarevsky
09c26d6805
Merge pull request #3999 from berak:features2d_tutorial_fix
2015-05-12 15:01:54 +00:00
berak
3fe69f4e67
small fixes for features2d tutorials
2015-05-10 13:44:49 +02: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
Roman Donchenko
e01b485ac6
Merge pull request #3973 from xsorifc28:patch-1
2015-04-30 12:48:51 +00:00
Philipp Hasper
dadf53f17c
Doxygen: replaced @includelineno by @include to enable copy-pasting
2015-04-29 09:31:53 +02:00
Vadim Pisarevsky
07e07655d4
Merge pull request #3967 from Belev:fix-typo
2015-04-28 14:47:05 +00:00
Belev
2200e0fb7e
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
2015-04-28 13:10:08 +03:00
Samed Ozdemir
5e44aa37ff
Fixed a typo, "requited" -> "required"
2015-04-27 23:00:39 -04:00
Milania1
b94c513cee
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
...
Conflicts:
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
2015-04-24 22:48:44 +02: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
Vadim Pisarevsky
5ab26e3202
Merge pull request #3874 from paroj:calib_sample
2015-04-01 11:13:05 +00:00
Pavel Rojtberg
7c5084e385
- update documentation
...
* correct the part about fixed aspect
* improve formatting
* add snippet markers to source
* replace inline code by @snippet
- do not run calibration twice when using a imageList
- make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
- respect write extrinsic/ points flags
- set the aspectRatio value when specified
- fix writing of calibration settings. also update grammar.
- fix intendation and remove some size_t -> int casts by using size_t
2015-03-31 15:45:57 +02:00
potpath
86c7d601b0
Fix a typo in template_matching.markdown
...
Fix a typo in first equation under method=CV_TM_CCOEFF.
2015-03-25 18:07:01 +07: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
berak
b7f2a4da69
fix features2d tutorials
2015-03-05 10:26:45 +01:00
Vadim Pisarevsky
22ad72d08e
Merge pull request #3690 from theodr:moprh_lines_detection_tut
2015-03-02 11:36:15 +00:00
Vadim Pisarevsky
e9d30a9383
Merge pull request #3746 from theodr:pca_tutorial
2015-03-02 11:29:33 +00:00
theodore
79bc85fb09
Introduction to PCA tutorial
2015-02-26 15:53:03 +01: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
theodore
96c824f375
Morphology Lines Extraction Tutorial
2015-02-24 14:33:15 +01:00
StevenPuttemans
ea54c01125
add remarks for iOS tutorial
2015-02-20 14:30:11 +01:00
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
2015-02-17 11:46:14 +03:00
Vadim Pisarevsky
fdf31ec14f
Merge pull request #3650 from StevenPuttemans:fix_tutorials_master
2015-02-16 11:45:37 +00:00
StevenPuttemans
be1728fba1
fixing tutorial errors master branch
2015-01-28 13:56:29 +01:00
tt
4ea2eceb70
Image Segmentation .cpp tutorial
...
Distance Transform tutorial fixes
Distance Transform fixes v.2
Distance Transform fixes v.3
Distance Transform fixes v.4
2015-01-27 16:44:52 +01:00
Marvin Smith
91fbe00caa
Updated gdal tutorial to include comments.
2015-01-17 19:28:58 -08: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
ecfd056111
Fixed whitespace warnings in new tutorials
2014-12-05 15:33:53 +03:00
Maksim Shabunin
6d282ddf72
Documentation: removed mention of Mat(IplImage*) constructor
2014-12-02 15:15:10 +03:00
Maksim Shabunin
d3beb755df
Doxygen tutorials: support contrib, some minor changes
2014-12-01 19:22:04 +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
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
a10a7279a8
Merge pull request #3334 from micha137:patch-2
2014-10-15 10:32:16 +00:00
micha137
67b2380d19
Update table_of_content_introduction.rst
2014-10-13 16:31:37 +02:00
micha137
96cd0d82e5
Update tutorials.rst
...
Change some wording
2014-10-13 16:20:47 +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
Alexander Shishkov
acc2efab50
updated links to the official OpenCV youtube channel
2014-09-01 11:28:43 +04:00
Ariel Elkin
d06c73861d
Doc: update video processing tutorial code for OpenCV v2.4.9 and v3a
2014-08-25 15:13:13 -03:00
Bence Magyar
1118a7d15a
Update tocDefinitions.rst
...
Second fix in docs needed for https://github.com/Itseez/opencv_contrib/pull/70
http://www.build.opencv.org/buildbot/builders/precommit-contrib_docs/builds/277
2014-08-20 15:32:05 +02:00
Vadim Pisarevsky
b2cd954f24
Merge pull request #3042 from edgarriba:master
2014-08-20 13:18:37 +00:00
Vadim Pisarevsky
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
f-morozov
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
edgarriba
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
mshabunin
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
edgarriba
e2edfecb80
fixed white space
2014-08-09 21:08:46 +02:00
edgarriba
591355d2c8
remove whitespaces
2014-08-09 20:49:44 +02:00
edgarriba
9547110533
Update tutorial
2014-08-09 19:47:42 +02:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
2353436cb5
Removed whitespace
2014-08-05 16:53:30 +02:00
edgarriba
4447dbe265
Removed whitespace
2014-08-05 16:41:07 +02:00
edgarriba
e3afc32693
Removed whitespace
2014-08-05 16:16:05 +02:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
edgarriba
56704b5e95
Update tutorial
2014-07-31 11:47:59 +02:00
edgarriba
9a25cb012d
Update some text
2014-07-30 17:05:06 +02:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
edgarriba
0ac84755a0
Update tutorial
2014-07-30 12:10:29 +02:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
edgarriba
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
edgarriba
e395e03040
Real Time Pose tutorial
2014-07-08 16:34:49 +02: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
Marvin Smith
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07: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
Vlad Shakhuro
6a93b43cae
Fix svm intro tutorial
2014-05-14 21:24:57 +04:00
Roman Donchenko
0ebde64701
Merge pull request #2743 from StevenPuttemans:bugfix_3549
2014-05-14 19:49:27 +04:00
StevenPuttemans
1d557e6702
adding bugfix 3549
2014-05-13 15:34:30 +02:00
StevenPuttemans
6c59e39f7c
fix bug 3434
2014-05-12 16:41:22 +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
Roman Donchenko
47d903d968
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-28 12:08:21 +04:00
Adrian Stratulat
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00: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
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Roman Donchenko
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
Ilya Lavrenov
9b9769169f
doc typos
2014-03-31 19:57:05 +04: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
Roman Donchenko
5effebb5f5
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
2014-03-25 12:14:44 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Daniil Osokin
ac19420907
Removed obsolete list from docs
2014-03-24 14:50:20 +01:00
Daniil Osokin
04b1822cff
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
2014-03-24 12:53:30 +04: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
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
2014-03-21 13:58:06 +04:00
Roman Donchenko
a66018d14d
Merge pull request #2423 from RJ2:bugfix_5
2014-03-21 13:54:52 +04:00
Kang Liu
17713f6831
1. fix an error in sample code
...
2. change an external link to maintain consistency with the previous tutorial
2014-03-19 13:05:38 +01:00
RJ2
0470bb0e29
I have changed one sentence in tutorial, making it more understandable
2014-03-18 08:59:53 +01:00
RJ2
16869225ff
It's will be better
2014-03-18 08:01:18 +01:00
Roman Donchenko
a489d86e5f
Merge pull request #2460 from berak:b_3598_24
2014-03-17 15:52:56 +04:00
berak
5f94a205d1
fixed h / s ranges in histogram_calculation tutorial
...
literalinclude
literalinclude, dropped :lines:
2014-03-17 11:01:02 +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
edbff68843
Merge pull request #2355 from alekcac:hough_circles_fix
2014-02-18 13:36:33 +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
Roman Donchenko
7358b44222
Merge pull request #2343 from yashdv:template_matching_doc_fix
2014-02-17 13:33:29 +04:00
Alexander Shishkov
f60913ddd3
small changes in hough circles tutorial
2014-02-17 12:55:19 +04:00
yash
cce225f6e9
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
2014-02-15 12:48:42 +05:30
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
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +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
Ilya Lavrenov
303c37a175
removed TOC
2014-01-21 18:47:22 +04:00
Ilya Lavrenov
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
Anatoly Baksheev
1449823bcd
implemented showImage
2014-01-19 18:38:55 +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
ComFreek
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Alexander Smorkalov
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
Roman Donchenko
ce07840e9f
Merge pull request #1966 from asmorkalov:ocv_neon_support
2013-12-20 17:04:17 +04:00
Alexander Smorkalov
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
2013-12-20 16:02:37 +04:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
Mimmmo Cosenza
00a180185e
remove Daniele
2013-12-11 13:35:20 +01:00
Mimmmo Cosenza
1c639befe6
add tutorial content
2013-12-11 13:30:52 +01:00
Mimmmo Cosenza
b1899e5489
add clojure tutorial
2013-12-11 13:28:27 +01:00
Mimmmo Cosenza
6f292d8036
add clojure logo
2013-12-11 13:28:04 +01:00
Mimmmo Cosenza
2784fd7b27
add Mimmo Cosenza to Authors
2013-12-11 13:25:53 +01:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
tim36272
7539156109
Fixed minor documentation typo
...
In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.
2013-11-27 04:09:40 -08:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
2013-11-22 10:41:17 +01:00
Daniel Neel
67a2c4ecd5
Re-phrased some odd wording.
2013-11-21 22:36:31 -05:00
Alexander Shishkov
4c9a6bd4ec
Update widget_pose.rst
...
changed Youtube link to our channel
2013-11-15 04:36:22 +03:00
moodoki
cebf109d39
Replaced code in .rst file with literalinclude as suggested
2013-11-15 00:27:07 +08:00
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
2013-11-06 14:24:18 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
2013-11-01 15:22:34 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
Samuel Wejéus
eddaaa9643
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
2013-10-24 10:36:01 +02:00
Pablo Speciale
169ebae8c0
After commit c7bbd1a
, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.
2013-10-03 00:43:12 +02:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
George Andrew Brindeiro
192ca711ef
Added nonfree headers that are required for using SURF features
2013-09-24 12:59:37 -03:00
Alexander Smorkalov
36e7697d1b
Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial
2013-09-24 14:44:33 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ozan Tonkal
223fb39d94
include viz tutorials in the main tutorials file. ignore viz samples
2013-09-17 20:17:13 +02:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
StevenPuttemans
199aa80915
Added typo in docs of tutorial
2013-09-13 15:01:18 +02:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Alexander Smorkalov
40212e1eb9
Link to Hough Circle Transform sample fixed in tutorial.
2013-09-09 13:53:49 +04:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
2969ec0274
transformations tutorial rst
2013-09-08 19:03:54 +02:00
Ozan Tonkal
7116e22b52
some of the tutorials
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
Ozan Tonkal
b60894c1dd
launching viz tutorial
2013-09-05 21:03:40 +02:00
Alexander Shishkov
cf275acbce
small changes in the tutorial
2013-09-04 15:14:49 +04:00
Alexander Shishkov
359771fdac
small fixes in the tutorial
2013-09-03 17:07:49 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
dbloisi
23f5eacafd
fixing trailing whitespaces
2013-09-01 22:38:21 +02:00
dbloisi
20f932bd46
fixing trailing whitespaces
2013-09-01 22:13:49 +02:00
dbloisi
f0910466f9
fixing trailing whitespaces
2013-09-01 20:59:27 +02:00
dbloisi
a34f7b7714
fixing other white spaces
2013-09-01 19:05:07 +02:00
Nghia Ho
81a6ae791b
changed int -> size_t when accessing std::vector
2013-08-31 23:35:03 +10:00
Zac Stewart
8049296cda
Correct name of eye function
2013-08-30 06:34:47 -04:00
Zac Stewart
f36a9f745f
Remove extraneous colon before ':basicstructures:'
2013-08-30 06:34:23 -04:00
zio dodo
5f7163bff2
Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial
...
Conflicts:
modules/stitching/src/motion_estimators.cpp
2013-08-29 20:12:12 +02:00
tambo83
281250ba0e
added a brief description for the learning rate parameter in the apply method
2013-08-29 17:20:45 +02:00
Roman Donchenko
7afc2677e6
Removed a duplicate line.
2013-08-28 13:13:15 +04:00
Baris Evrim Demiroz
9a560a5a8d
Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial.
2013-08-27 22:42:03 +03:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
2013-08-23 15:18:06 +04:00
zio dodo
ea544f08cc
Added a small modifications in the code formatting of background subtraction tutorial
2013-08-23 13:04:10 +02:00
berak
50288f1314
rebased commits
2013-08-22 18:40:30 +02:00
berak
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
2013-08-22 17:38:59 +02:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
zio dodo
449b4d8a65
Added the tutorial on background subtraction, in the video section
2013-08-21 12:06:48 +02:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
e3d508902e
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
2013-08-14 12:08:59 +04:00
StevenPuttemans
89012e8f6b
Missing including of nonfree module to support the use of SURF
...
detector/descriptor.
2013-08-13 14:23:24 +02:00
Roman Donchenko
77df8e574f
Fixed CR line endings in non_linear_svms.rst.
2013-08-13 13:29:09 +04:00
Dmitry Retinskiy
2765f3f7ad
Minor language corrections in the tutorial document
2013-08-09 10:32:34 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Roman Donchenko
48e31fd202
Merge pull request #1168 from StevenPuttemans:feature_2753
2013-07-23 11:54:40 +04:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
StevenPuttemans
7968789544
Made change to install in windows guide, showing only difference between VS2010 and VS2012
2013-07-22 15:16:22 +02:00
StevenPuttemans
a58860d35a
Removed Note, added other fix (libs to lib)
2013-07-17 15:02:55 +02:00
StevenPuttemans
d42b283abf
Changed tutorial for installing openCV under VS2010 like bug 3157 suggested
2013-07-17 13:38:45 +02:00
Roman Donchenko
3443fd85cd
Merge pull request #984 from albenoit:master
2013-07-16 11:57:52 +04:00
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
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
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02: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
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
Kirill Kornyakov
0339dd51f1
Removed all references to trunk
2013-06-28 12:38:44 +04:00
Kirill Kornyakov
f065c46fbe
Completely get rid of opencv_group
2013-06-28 12:15:14 +04:00
Kirill Kornyakov
a78ebc1175
Updated a couple of more links
2013-06-28 12:12:53 +04:00
Kirill Kornyakov
2980a88570
Mentioned 2.4 and master branches
2013-06-28 11:51:40 +04:00
Kirill Kornyakov
e447d87496
Added link to contribution process, updated formatting
2013-06-28 11:44:10 +04:00
Alexander Shishkov
a8db327574
changed contacts in tutorual
2013-06-28 11:44:09 +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
Roman Donchenko
e6784ca8a0
Merge pull request #1021 from alekcac:platforms
2013-06-25 11:32:52 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Alexander Shishkov
68741bf8a0
moved iOS part to platforms folder
2013-06-19 00:20:21 +04:00
Alexander Shishkov
93200922fd
Fix bug with indices
2013-06-14 13:12:35 +04:00
Sergei Nosov
982ef83f80
Fixes bug #3071 .
...
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
2013-06-13 11:51:45 +04:00
alexandre benoit
7bff79bbeb
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
2013-06-12 22:43:36 +02:00
alexandre benoit
cdbbe0dfbe
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
2013-06-12 22:40:43 +02:00
Jordi Villar
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
alexandre benoit
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
alexandre benoit
80e65e08b5
updated doc and interface code to solve compile warnings and errors
2013-04-30 14:40:03 +02:00
alexandre benoit
1976b3d9b6
updated doc
2013-04-29 20:08:13 +02:00
alexandre benoit
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
alexandre benoit
16dea7b90d
updated comments and new retina interface use
2013-04-27 23:18:47 +02:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
5163986e7d
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
2013-04-05 11:46:06 +04:00
Gurpinder Singh Sandhu
87b84a4197
another update
2013-04-04 23:13:03 +05:30
Gurpinder Singh Sandhu
d51d05fc44
Feature description tutorials made in sync with sample code
...
sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888
2013-04-04 23:12:18 +05:30
Andrey Kamaev
80fed87d53
Merge pull request #760 from alekcac:2.4
2013-04-04 18:44:35 +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
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Vadim Pisarevsky
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-24 23:48:35 +04:00
Jonathan Bohren
221d610d55
calib3d model superscript should be subscript
2013-03-15 00:29:46 -03:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00