vbystricky
|
d58f736935
|
Split highgui module to videoio and highgui
|
2014-07-14 23:16:47 +04:00 |
|
vbystricky
|
4286f60387
|
Extract imgcodecs module from highgui
|
2014-07-07 16:28:08 +04: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 |
|
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 |
|
Ilya Lavrenov
|
20b6191842
|
doc fix
|
2014-03-23 16:20:00 +04:00 |
|
Adi Shavit
|
8fd0fd538d
|
Doc fix.
|
2014-01-16 16:30:54 +02:00 |
|
Adi Shavit
|
46f06d82c9
|
Update docs.
|
2014-01-16 12:51:14 +02:00 |
|
Adi Shavit
|
8802d62cc5
|
Updated docs.
|
2014-01-16 11:25:57 +02: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 |
|
Andrey Pavlenko
|
429ab8ebee
|
Merge pull request #1845 from StevenPuttemans:bugfix_3306
|
2013-11-29 23:08:20 +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
|
1b0297d92b
|
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes
|
2013-11-25 09:35:23 +01:00 |
|
Vadim Pisarevsky
|
e2bbe7597b
|
fixed few compile errors and doc build errors
|
2013-11-18 13:48:04 -05:00 |
|
Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Vladislav Vinogradov
|
a41006754e
|
fix documentation
|
2013-09-02 14:00:44 +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 |
|
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 |
|
Roman Donchenko
|
2530b580a8
|
Merge branch 'master' into merge-2.4
Conflicts:
modules/photo/doc/inpainting.rst
|
2013-08-16 14:14:12 +04:00 |
|
abidrahmank
|
92d04d439e
|
docs changes
|
2013-08-13 21:58:49 +05:30 |
|
Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
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/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
StevenPuttemans
|
ed76b2f98f
|
Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
|
2013-08-07 14:49:33 +02:00 |
|
Roman Donchenko
|
8bed7bb5f9
|
Fixed documentation errors.
|
2013-08-06 18:07:08 +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 |
|
StevenPuttemans
|
f28496c628
|
Added sample links in documentation for python2, ocl and gpu
|
2013-08-02 14:05:08 +02:00 |
|
Andrey Pavlenko
|
d138f77143
|
Merge pull request #1019 from jet47:opengl-documentation
|
2013-07-31 15:10:27 +04:00 |
|
StevenPuttemans
|
0c5244103f
|
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
|
2013-07-31 11:20:05 +02:00 |
|
abidrahmank
|
fa1b96bd36
|
imshow docs improvement bug#2490
|
2013-07-30 07:00:51 +05:30 |
|
abidrahmank
|
bcf9117957
|
Added missing python functions in highgui documentation
setMouseCallback
createTrackbar
|
2013-06-24 15:53:45 +05:30 |
|
Vladislav Vinogradov
|
af2fc1a22a
|
added documentation for OpenGL interoperability
|
2013-06-20 16:11:10 +04:00 |
|
IanVS
|
41fc41829c
|
Updated documentation to new "COLOR_" format for color conversion enums.
|
2013-06-05 21:59:01 -04:00 |
|
Vadim Pisarevsky
|
54afb85d0c
|
Merge pull request #823 from pickle27:starter_image_sequence
|
2013-05-14 15:56:35 +04:00 |
|
Kevin Hughes
|
eedb6fa3c4
|
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
|
2013-04-17 13:20:32 -04:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
befd696720
|
Update documentation
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
33ef7990b0
|
Update documentation
|
2013-03-22 22:14:54 +04:00 |
|
AoD314
|
9680176fa9
|
added docs
|
2013-03-11 15:47:21 +04:00 |
|
Andrey Kamaev
|
61079547f0
|
Merge branch '2.4'
|
2013-02-01 14:59:40 +04:00 |
|
Daniil Osokin
|
fe5b9df45f
|
Fixed multiple issues in docs (bug #2410)
|
2013-01-31 17:34:40 +04:00 |
|
Andrey Kamaev
|
4d059e9e5b
|
Merge release 2.4.3
|
2012-11-02 17:58:02 +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
|
0e7ca71dcc
|
Normalize whitespace in documentation and text files
|
2012-10-17 21:42:09 +04:00 |
|
Kirill Kornyakov
|
aedf56404e
|
made imread description slightly better #2406
|
2012-10-15 15:23:38 +04:00 |
|
Vsevolod Glumov
|
b91ca6a73f
|
Removed the phrase, that was causing all the confusion. Issue #2406.
+ Some minor formatting fixes.
|
2012-10-12 14:15:30 +04:00 |
|
Vadim Pisarevsky
|
c9f1490302
|
added variant of cv::imdecode with the specified output matrix
|
2012-10-01 16:23:40 +04:00 |
|
Andrey Kamaev
|
5100ca7508
|
svn repository web references are replaced with links to git
|
2012-08-07 14:30:36 +04:00 |
|
Andrey Kamaev
|
314813e51c
|
Added C++ and python signatures for moveWindow, resizeWindow and setMouseCallback
|
2012-05-31 08:11:47 +00:00 |
|
Andrey Kamaev
|
05de6302fd
|
Fixed documentation: corrected parameter names
|
2012-05-29 10:36:19 +00:00 |
|
Andrey Kamaev
|
6ca618277c
|
More fixes for documentation.
|
2012-05-28 20:11:38 +00:00 |
|