Daniel Angelov
303868b3c4
Fixed variable name consistency
...
The function parameters were different from the ones described below.
P.S. Why is ``flow`` InputOutputArray, shouldn't it be just OutputArray? If so, shouldn't the reason be specified - e.g. so others can benefit as well (e.g. not allocating memory on every frame?)
2014-11-14 22:49:22 +00:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Vadim Pisarevsky
e40567eaee
Merge pull request #3352 from alucarded:BackgroundSubtractorMOG2_optimization
2014-10-22 01:55:23 +00:00
Tomasz Posłuszny
8dd213c829
BackgroundSubtractorMOG2, learningRate=0 optimization
2014-10-20 19:45:31 +02:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
2014-10-16 14:51:53 +00:00
Vadim Pisarevsky
b30ad42609
Merge pull request #3270 from boaz001:patch-1
2014-10-16 10:09:28 +00:00
Boaz Stolk
ae81006eab
Applied proposed fix
2014-10-15 22:36:38 +02:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
vbystricky
a75807354d
Optimize OpenCL version function BackgroundSubstractionMOG2
2014-09-23 10:33:30 +04:00
Juan Carlos Niebles
dc49e11527
removed setter methods, replaced by CV_PROP_RW macro
2014-09-18 09:39:35 -05:00
Juan Carlos Niebles
f610c88103
extended python interface for KalmanFilter
2014-09-17 18:45:48 -05:00
Ernest Galbrun
2f077fcd99
fixed failing test in opencv_video
2014-08-19 10:00:03 +02:00
Ernest Galbrun
6207d338dd
merged new master branch
...
changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf)
2014-08-18 15:29:45 +02:00
Ernest Galbrun
fae69df9a9
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
...
Conflicts:
modules/video/doc/motion_analysis_and_object_tracking.rst
2014-08-17 22:08:12 +02:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
07744af790
Merge pull request #3066 from vpisarev:minor_fixes
2014-08-11 10:27:30 +00:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Vadim Pisarevsky
0224a20ff6
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
2014-08-08 22:33:40 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Ernest Galbrun
7b8bb4248b
Merge branch 'cuda_concurrency' into tvl1_chambolle
2014-07-31 16:08:57 +02:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Ernest Galbrun
62fed8b7b2
retry after failure to load from the build bot
2014-07-07 12:55:07 +02:00
Ernest Galbrun
3d8e05d711
documentation formatting
2014-07-07 12:46:59 +02:00
Ernest Galbrun
5c8e679bdc
still a couple tabs and trailing whitespaces...
2014-07-07 12:34:23 +02:00
Ernest Galbrun
ca6fb27ea6
removed some tabs
2014-07-07 09:49:57 +02:00
Ernest Galbrun
eb6c598678
changed nullptr to NULL to avoid c++11 (failed to build on linux)
...
replaces tabs with spaces
2014-07-07 09:32:48 +02:00
Ernest Galbrun
062e1cbe06
edited documentation to take into account changes in TVL1
2014-07-04 15:45:58 +02:00
Ernest Galbrun
4bd55c6f73
added comments and reference for Chambolle paper
2014-07-04 15:33:34 +02:00
Ernest Galbrun
693c4e5741
debug of cuda_tvl1 => pass tests succesfully
2014-07-04 14:23:09 +02:00
Ernest Galbrun
afb9b9540c
performance issue when gamma=0
2014-07-02 12:01:59 +02:00
Ernest Galbrun
f2e09d048c
changed default value for gamma (now 0 -> no use of gamma)
2014-07-02 10:38:32 +02:00
Ernest Galbrun
c45e645d6c
Merge branch 'master' into tvl1_ali
2014-07-01 10:17:07 +02:00
Ernest Galbrun
5101a7fc00
replaced tabs by spaces
2014-06-27 15:41:39 +02:00
krodyush
2e2ca58b70
fix according review
2014-05-30 15:44:51 +04:00
krodyush
153ac43d3b
opencl opticaflow fix that enables buffer2image extension
2014-05-28 10:34:11 +04: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
Alexander Mordvintsev
a52979c37f
exposed TVL1 optical flow to python
2014-05-14 17:45:21 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
vbystricky
a13e6ab79f
Fix problem with sanity check of transform ecc with ipp resize
2014-04-25 17:33:38 +04:00
Ernest Galbrun
6a6f24b170
adding new ali's feature
2014-04-18 16:36:34 +02:00
Maks Naumov
3e5a69d8ba
remove unused variables in OCL_PERF_TEST_P()
2014-04-17 00:19:04 +03:00
Andrey Pavlenko
80ef1f6753
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
2014-04-15 19:56:56 +04:00
Vadim Pisarevsky
7942494fb6
Merge pull request #2233 from palindromoroz:BGSubtract_KNN_new_code
2014-04-15 13:22:43 +04:00
Vadim Pisarevsky
9cdd15e141
Merge pull request #2615 from krodyush:pullreq/140319-PyrLKOpticalFlow-fix
2014-04-15 13:19:45 +04:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
krodyush
57992e0169
replace IPatchLocal[][] into *IPatchLocal to fix compilation error on some devices.
2014-04-14 13:23:12 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Andrey Pavlenko
e013f04669
Merge pull request #2583 from ilya-lavrenov:ippicv
2014-04-09 14:14:14 +04:00
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
2014-04-09 13:08:51 +04:00
Ilya Lavrenov
b56b9c43dc
cv::updateMotionHistory
2014-04-09 00:11:28 +04:00
Vadim Pisarevsky
1b339eb0d4
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
2014-04-08 17:54:08 +04:00
Firat Kalaycilar
990295644e
made a performance improvement.
...
changed the way the mean value for each pixel is assigned in the output image.
2014-04-08 16:10:32 +03:00
krodyush
616ec74beb
fix previous merge error
2014-04-07 17:32:39 +04:00
krodyush
4ca695cab0
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
...
Conflicts:
modules/video/src/opencl/pyrlk.cl
2014-04-04 11:26:08 +04:00
unknown
75534a4828
Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now.
2014-03-28 14:23:10 +01: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
Andrey Pavlenko
157f35ef29
Merge pull request #2503 from mlyashko:optflow_dualtvl1
2014-03-24 10:35:51 +04:00
Andrey Pavlenko
f368b27f0a
Merge pull request #2489 from vbystricky:iocl_pyrlk
2014-03-21 18:33:32 +04:00
Firat Kalaycilar
c9f51d5eed
modified BackgroundSubtractorMOG2::getBackgroundImage so that it can now work with gray-level images.
2014-03-21 09:44:11 +02:00
mlyashko
80a40ae3d7
changed epsilon for test pass on Win32
2014-03-20 16:15:43 +04:00
krodyush
65d64af2a8
ocl_calcOpticalFlowPyrLK optimizations
...
1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
2014-03-19 19:31:14 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
vbystricky
6890aa0033
Fix problems on Intel HD graphics
2014-03-17 16:03:15 +04:00
Firat Kalaycilar
a87607e3ef
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2
2014-03-12 16:14:59 +02:00
Andrey Pavlenko
702a2a6ff6
Merge pull request #2373 from mlyashko:optflow_dualtvl1
2014-03-11 16:00:22 +04:00
mlyashko
eb2e8a11fa
changed kernel.set to support unsuccssful set
2014-03-07 11:15:54 +04:00
mlyashko
66ed6a8a50
macro for normal return from thriveless kernel.set
2014-03-06 11:43:01 +04:00
Cody Rigney
a80ebfe28d
Master Version: Added NEON Optimizations for LK Optical Flow.
2014-03-04 14:47:12 -05:00
Roman Donchenko
b5248dbf3f
Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
2014-03-04 15:30:26 +04:00
mlyashko
5c867463d2
changed localsize to NULL (reviewers comment)
2014-03-04 11:36:47 +04:00
Cody Rigney
fbc69e444b
Added NEON optimizations for LK optical flow (Intrinsics).
2014-02-28 16:48:04 -05:00
mlyashko
ba5ebaa758
changed file name to case-sensitve to support linux
2014-02-26 10:55:18 +04:00
Ilya Lavrenov
ce0557ebb8
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
mlyashko
e75a257f92
changed epsilon for test passing
2014-02-24 17:47:56 +04:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
mlyashko
10f2a038c2
Optical flow dualt tvl1 ocl-based implementation and tests
2014-02-20 14:23:10 +04:00
Andrey Pavlenko
bd6620fa87
Merge pull request #2252 from ilya-lavrenov:ocl_ref
2014-02-04 16:34:28 +04:00
Ilya Lavrenov
da5b316b4e
minor ocl.cpp refactoring
...
fix for cv::LUT and cv::transpose
2014-02-04 01:52:48 +04:00
Ilya Lavrenov
31b7cdc695
implemented OpenCL version of cv::updateMotionHistory
2014-02-02 17:52:57 +04:00
Andrey Pavlenko
25d2ab8a68
Merge pull request #2218 from alalek:fix_defects_code_coverity
2014-01-31 19:23:02 +04:00
Elena Gvozdeva
69630ee9d9
fixed test
2014-01-31 10:46:29 +04:00
U-WBI\nlv20442
be7eb72051
some fixes
2014-01-30 14:50:35 +01:00
U-WBI\nlv20442
d950adc0d2
function code
2014-01-30 10:51:12 +01:00
unknown
14b1e8c7f1
New KNN code -should compile now
2014-01-30 10:47:12 +01:00
Alexander Alekhin
6fa49f6e80
fix unintialized fields
2014-01-29 19:59:03 +04:00
Elena Gvozdeva
96b6f338e1
fixed
2014-01-29 14:27:29 +04:00
Elena Gvozdeva
17c6b4d306
fixed warnings
2014-01-29 11:05:05 +04:00
Elena Gvozdeva
0edd0aaf69
fixed
2014-01-28 16:23:39 +04:00
Elena Gvozdeva
1391ca1da5
Added ocl_Mog2
2014-01-28 16:23:38 +04:00
vbystricky
bb09d44e0a
Unused code removed
2014-01-24 17:37:54 +04:00
vbystricky
27fb7e1802
Change type of result vector of ocl version from row to column
2014-01-24 17:37:53 +04:00
vbystricky
094bc92318
Fix build error
2014-01-24 17:37:53 +04:00
vbystricky
a7e5a488a8
Change method of setting arguments to kernel to safe one
2014-01-24 17:37:52 +04:00
vbystricky
e96ba8140c
Grow up epsilon for sanity checks
2014-01-24 17:37:52 +04:00
vbystricky
3a798a27e5
Add perfomance test
2014-01-24 17:37:52 +04:00
vbystricky
ece635bf3c
Fix builds errors
2014-01-24 17:37:51 +04:00
vbystricky
3ba6636651
Fix builds errors
2014-01-24 17:37:51 +04:00
vbystricky
33fc46cdec
Validate parameters for using OpenCL version, before upload UMat
2014-01-24 17:37:50 +04:00
vbystricky
4152135e63
Fix error with some opencl functions on the build WITH_OPENCL=OFF
2014-01-24 17:37:50 +04:00
vbystricky
c57e427fba
Move OpticalFlowPyrLK from ocl module to video module
2014-01-24 17:37:50 +04:00
Andrey Pavlenko
9aa4410509
Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback
2014-01-22 18:57:34 +04:00
vbystricky
e0c6377d58
Change the sanity checking type to ERROR_RELATIVE
2014-01-22 10:34:27 +04:00
vbystricky
c1172b83dd
Change epsilon value to 0.01
2014-01-21 18:46:26 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
vbystricky
f1541b5287
Add perfomance test
2014-01-17 16:15:39 +04:00
vbystricky
fc8b385ff6
Return false if ocl version not properly worked
2014-01-17 16:15:38 +04:00
vbystricky
3762036b08
Fix compiler warnings. Add additional test case for UseInitFlow
2014-01-17 16:15:38 +04:00
vbystricky
3b0fa68a97
Move OpticalFlowFarneback from ocl module to video module
2014-01-17 16:15:38 +04:00
Roman Donchenko
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
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Ilya Lavrenov
6083efc111
refactored cv::CamShift and cv::meanShift
2013-12-21 14:40:59 +04:00
berak
34a390fbc2
CV_WRAP for BackgroundSubtractorMOG2
2013-11-30 13:35:23 +01:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +04:00
Nghia Ho
2238e711b5
Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step.
2013-10-20 13:00:11 +11:00
Roman Donchenko
808e0cf10b
Boring changes - video.
2013-09-05 19:02:58 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +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
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
7d768d2159
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
...
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
2013-08-16 14:43:18 +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
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +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
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
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +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
297b67d2b1
pydocs for cv2.findTransformECC
2013-07-21 13:40:11 +05:30
abidrahmank
84179b8a4e
bgdsubtractorGMG docs
2013-07-19 23:11:30 +05:30
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Sergei Nosov
c90abb6a03
add multiruns to fix "unreliable results" error
2013-06-13 21:14:42 +04:00
Vladislav Vinogradov
99a5b3417a
added missing BackgroundSubtractorMOG2 parameters
2013-06-10 13:41:46 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
Andrey Kamaev
8fdab9f631
Merge branch '2.4'
2013-04-17 12:07:17 +04:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
96b008cd29
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
...
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
Andrey Kamaev
e27f4da9c6
Merge pull request #795 from taka-no-me:move_imgproc_utils_to_core
2013-04-11 11:35:15 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
b0e6606b98
Cleanup core module API
...
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
2013-04-09 13:36:32 +04:00
Andrey Kamaev
913e6833d5
Merge pull request #785 from taka-no-me:split_c_cpp2
2013-04-09 08:53:50 +04:00