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
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
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
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
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4
minor updates for doc redirections and tutorial images size
2012-10-30 15:06:13 +04:00
alexandre benoit
f593616b84
minor update
2012-10-30 15:06:13 +04:00
alexandre benoit
e475010e14
updated first image sample
2012-10-30 15:06:13 +04:00
alexandre benoit
f05f374fb5
updated tutorial, rapid spell check, retina parameters discussion added
2012-10-30 15:06:13 +04:00
alexandre benoit
3eb4e38735
updated tutorial, need spell check, validation, nicer images and a discussion on parameters
2012-10-30 15:06:13 +04:00
alexandre benoit
23bd673598
adding retina tutorial
2012-10-30 15:06:13 +04:00
alexandre benoit
cdc4679b3e
introducing a tutorial for the retina model
2012-10-30 15:06:13 +04:00
alexandre benoit
a0c92265db
minor updates for doc redirections and tutorial images size
2012-10-28 18:52:04 +01:00
alexandre benoit
4e58fd645c
minor update
2012-10-28 18:34:48 +01:00
alexandre benoit
02666567b0
updated first image sample
2012-10-28 10:57:03 +01:00
alexandre benoit
4c5bcd80de
updated tutorial, rapid spell check, retina parameters discussion added
2012-10-24 12:04:32 +02:00
alexandre benoit
90d10e6b73
updated tutorial, need spell check, validation, nicer images and a discussion on parameters
2012-10-23 18:57:39 +02:00
Andrey Kamaev
91f47d2779
Merge branch '2.4'
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2012-10-23 20:39:02 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
alexandre benoit
6e63073c6c
adding retina tutorial
2012-10-22 13:51:55 +02:00
alexandre benoit
0d3fb3cef3
introducing a tutorial for the retina model
2012-10-22 13:36:30 +02:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
2012-10-15 15:23:38 +04:00
Vsevolod Glumov
a2088d0c52
Replaced SVN instructions with Git ones for 'Installation in Windows' section (Issue #2249 ); Also, fixed both bugs from issue #2374 in the same section.
2012-10-11 18:37:00 +04:00
Vsevolod Glumov
a3080636ba
Replaced SVN instructions with Git instructions in iOS and Linux installation tutorials. Issue #2249
...
+ Minor formatting fixes.
2012-10-11 16:44:53 +04:00
Vsevolod Glumov
1f21b96b9d
Fixed the formulas, based on issue #2145
2012-10-11 03:26:23 +04:00
Alexander Smorkalov
306ed9801a
Issue #2284 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
Vadim Pisarevsky
a4adf57edc
fixed typos in the mat tutorial (ticket #2380 )
2012-10-01 16:35:12 +04:00
Vadim Pisarevsky
36dacc688a
removed non-existing CoreAnimation framework from the list of required frameworks (bug #2326 )
2012-09-06 14:22:40 +04:00
Vadim Pisarevsky
283087dd56
fixed typo (bug #2327 )
2012-09-06 14:16:18 +04:00
Vadim Pisarevsky
a6e2acbfee
added a few missing images for tutorials; integrated pull request #26
2012-08-30 16:23:18 +04:00
Vadim Pisarevsky
3d4ca2d709
added ios tutorials by Charu Hans and Eduard Feicho
2012-08-30 15:49:53 +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