7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
2353436cb5
Removed whitespace
2014-08-05 16:53:30 +02:00
4447dbe265
Removed whitespace
2014-08-05 16:41:07 +02:00
e3afc32693
Removed whitespace
2014-08-05 16:16:05 +02:00
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
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
56704b5e95
Update tutorial
2014-07-31 11:47:59 +02:00
08e8f9ca45
Added some definitions
2014-07-31 11:47:26 +02:00
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
9a25cb012d
Update some text
2014-07-30 17:05:06 +02:00
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
0ac84755a0
Update tutorial
2014-07-30 12:10:29 +02:00
16a82b1747
Added an option to traincascade program to select the maximum number of threads to use during training
2014-07-23 22:47:51 +02:00
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
e395e03040
Real Time Pose tutorial
2014-07-08 16:34:49 +02:00
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
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
cac1218eef
Build both Python 2 and Python 3 bindings
...
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process. Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.
The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python. Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3. Both are built from the same source. but for different
versions of Python.
2014-06-29 20:08:13 -04:00
3ece65ad62
Updates python feature matching tutorial
...
The given ORB parameter was misspelled
2014-06-24 11:35:22 +02:00
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
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
7c44a07810
fix typo in linux tutorial
2014-06-02 09:35:19 +02:00
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
6a93b43cae
Fix svm intro tutorial
2014-05-14 21:24:57 +04:00
0ebde64701
Merge pull request #2743 from StevenPuttemans:bugfix_3549
2014-05-14 19:49:27 +04:00
1d557e6702
adding bugfix 3549
2014-05-13 15:34:30 +02:00
6c59e39f7c
fix bug 3434
2014-05-12 16:41:22 +02:00
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
a9c7db7518
add suggestion of feature 2619
2014-05-09 13:44:12 +02:00
99475e2976
fixed wrong download link in tutorial
2014-05-08 10:45:51 +02:00
897d0a9aaf
Updated documentation: library names
...
updated the library names to OpenCV version 2.4.9
2014-05-05 12:16:48 +02:00
47d903d968
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-28 12:08:21 +04:00
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00:00
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
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
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
a8cb5c3983
Merge pull request #2554 from asmorkalov:ocv_249_version
2014-04-01 12:16:25 +04:00
e23f7303a6
OpenCV version++. OpenCV Manager version++.
2014-03-31 15:00:25 -07:00
9b9769169f
doc typos
2014-03-31 19:57:05 +04:00
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
5005f5e88e
Fixed type gPython -> Python
2014-03-26 23:15:42 -07:00
c764e0f114
Added link to main GitHub repo
2014-03-26 23:12:43 -07:00
9f1b20a794
Grammar
2014-03-26 23:11:03 -07:00
5effebb5f5
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
2014-03-25 12:14:44 +04:00
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
ac19420907
Removed obsolete list from docs
2014-03-24 14:50:20 +01:00
04b1822cff
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
2014-03-24 12:53:30 +04:00
edgarriba
Roman Donchenko
Michael Pratt
f-morozov
Joan Puigcerver
vbystricky
Marvin Smith
PhilLab
Neo Alienson
StevenPuttemans
Vlad Shakhuro
Adrian Stratulat
Andrey Pavlenko
Elena Gvozdeva
Alexander Smorkalov
Ilya Lavrenov
Kenaniah Cerny
Daniil Osokin