mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,462 Commits 6 Branches 126 Tags 3 GiB
1118a7d15a
Commit Graph

445 Commits

Author SHA1 Message Date
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