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 |
|
Adrien BAK
|
38904c9a11
|
fix exception being thrown when no arguments are passed
|
2013-11-28 12:09:17 +09:00 |
|
Adrien BAK
|
094d7c4926
|
build fix
|
2013-11-28 11:42:44 +09:00 |
|
Adrien BAK
|
dda3b534ad
|
fix indent
|
2013-11-26 16:09:59 +09:00 |
|
Adrien BAK
|
1c025be068
|
fix typos
|
2013-11-26 16:09:42 +09:00 |
|
Adrien BAK
|
514f1fae95
|
improved error handling
|
2013-11-26 16:09:29 +09:00 |
|
Adrien BAK
|
8a2de2ecca
|
modified HoughCircleDemo to introduce variable params via trackbars
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
|
2013-11-26 16:09:04 +09:00 |
|
StevenPuttemans
|
2b106db02f
|
Applied all fixes related to translating C to C++ code
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
|
2013-11-17 20:34:50 +01:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Andrey Kamaev
|
b131dfeecd
|
Build tutorial codes together with other samples
These codes should be included into regular builds.
|
2012-11-09 10:15:48 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Ana Huaman
|
8f01f2cc9f
|
Added 02 tutorials for Hough Lines and Circle detection in tutorial_code -- based on code existent
|
2011-06-28 19:32:48 +00:00 |
|