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
0470bb0e29
I have changed one sentence in tutorial, making it more understandable
2014-03-18 08:59:53 +01:00
16869225ff
It's will be better
2014-03-18 08:01:18 +01:00
a489d86e5f
Merge pull request #2460 from berak:b_3598_24
2014-03-17 15:52:56 +04:00
5f94a205d1
fixed h / s ranges in histogram_calculation tutorial
...
literalinclude
literalinclude, dropped :lines:
2014-03-17 11:01:02 +01:00
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
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
eedf86402d
typos
2014-03-02 21:04:17 +04:00
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
edbff68843
Merge pull request #2355 from alekcac:hough_circles_fix
2014-02-18 13:36:33 +04:00
689589ebaa
Merge pull request #2365 from yashdv:image_tutorial_doc_bug
2014-02-18 11:58:11 +04:00
13182da945
Merge pull request #2363 from alekcac:introduction_tut_fix
2014-02-18 11:56:57 +04:00
017a282c7a
Minor error in the documentation Load and Save Image
2014-02-18 10:34:58 +05:30
a8eab26bae
fixed incorrect code in introduction tutorial
2014-02-17 18:10:08 +04:00
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
7358b44222
Merge pull request #2343 from yashdv:template_matching_doc_fix
2014-02-17 13:33:29 +04:00
f60913ddd3
small changes in hough circles tutorial
2014-02-17 12:55:19 +04:00
cce225f6e9
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
2014-02-15 12:48:42 +05:30
e2f5001b11
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
2014-02-14 23:04:03 +05:30
01b624e359
-j8 in linux_installation tutorial
2014-02-13 13:52:00 +05:30
2806679781
Updated DisplayImage.cpp program to compile
...
CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE
2014-02-11 21:46:14 -08:00
dad536f490
Merge pull request #1851 from dneelyep:patch-1
2014-02-11 16:46:35 +04:00
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
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
dca5684145
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
2014-01-23 17:05:20 +04:00
ee331001f5
Merge pull request #2161 from SpecLad:doc-req
2014-01-22 12:04:48 +04:00
303c37a175
removed TOC
2014-01-21 18:47:22 +04:00
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
2014-01-20 22:51:33 +04:00
1449823bcd
implemented showImage
2014-01-19 18:38:55 +04:00
a502ffbd2c
Updated required CMake version in docs to match reality.
2014-01-17 14:50:40 +04:00
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
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
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
4ec1930949
OpenCV version++; OpenCV Manager version++.
2013-12-23 12:35:06 +04:00
ce07840e9f
Merge pull request #1966 from asmorkalov:ocv_neon_support
2013-12-20 17:04:17 +04:00
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
2013-12-20 16:02:37 +04:00
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
00a180185e
remove Daniele
2013-12-11 13:35:20 +01:00
1c639befe6
add tutorial content
2013-12-11 13:30:52 +01:00
b1899e5489
add clojure tutorial
2013-12-11 13:28:27 +01:00
6f292d8036
add clojure logo
2013-12-11 13:28:04 +01:00
2784fd7b27
add Mimmo Cosenza to Authors
2013-12-11 13:25:53 +01:00
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
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
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
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
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Kang Liu
RJ2
Roman Donchenko
berak
Ilya Lavrenov
yash
Alexander Shishkov
Rohit Girdhar
Elliot Godzich
Vadim Pisarevsky
Andrey Pavlenko
Anatoly Baksheev
ComFreek
Alexander Smorkalov
Mimmmo Cosenza
tim36272