Commit Graph

14115 Commits

Author SHA1 Message Date
VBystricky
cc703b01df Fix build errors with cap_v4l on Linux 2014-07-20 18:27:14 +04:00
Lars Glud
1242a66119 Openni2 support 2014-07-20 15:04:11 +02:00
Lars Glud
4dcd37f699 Merge remote-tracking branch 'origin/master' into Openni2Support
Conflicts:
	modules/highgui/CMakeLists.txt
	modules/highgui/include/opencv2/highgui.hpp
	modules/highgui/include/opencv2/highgui/highgui_c.h
2014-07-20 14:28:10 +02:00
Vadim Pisarevsky
9a58b1a3a0 Merge pull request #2925 from BloodAxe:osx-framework-script 2014-07-19 18:04:15 +00:00
Vadim Pisarevsky
a7006ac21c Merge pull request #2979 from PhilLab:patch-2 2014-07-18 09:58:07 +00:00
Vadim Pisarevsky
17d69be902 Merge pull request #2933 from ilya-lavrenov:sse_moments 2014-07-18 09:25:22 +00:00
PhilLab
e82241cba5 Function for drawing arrows
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970) To the new InputOutputArray type
2014-07-18 10:04:44 +02:00
Aaron Denney
4644689d5a And remove final vestiges. 2014-07-17 09:43:21 -07:00
Aaron Denney
85601e03dd remove constant memory use in compute_data_cost 2014-07-17 09:43:21 -07:00
Aaron Denney
52516085d9 remove constant memory from init_data_cost 2014-07-17 09:43:21 -07:00
Aaron Denney
1ff270e41c init_message no longer uses constant memory. 2014-07-17 09:43:21 -07:00
Aaron Denney
9b8002cd43 remove use of constant memory in calc_all_iterations/compute_message/message_per_pixel 2014-07-17 09:43:21 -07:00
Aaron Denney
b792419cde Remove compute_disp()'s use of constant memory. 2014-07-17 09:43:21 -07:00
Aaron Denney
6d86d63ac5 Last of csbp load_constants() gone. 2014-07-17 09:43:21 -07:00
Aaron Denney
9bc71f4cb6 Deconstify minimum disparity. 2014-07-17 09:43:21 -07:00
Aaron Denney
eed5cbc5db More constant removal. 2014-07-17 09:43:21 -07:00
Aaron Denney
3ab117df04 Change struct with single static function to function. 2014-07-17 09:43:20 -07:00
Aaron Denney
021b0cb4d5 Pass max_disc_term as kernel parameter. 2014-07-17 09:43:20 -07:00
Aaron Denney
0e2ea45c93 ndisp no longer constant 2014-07-17 09:43:20 -07:00
Aaron Denney
2832cfdfe5 No longer use constant memory for image step. 2014-07-17 09:43:20 -07:00
Aaron Denney
d8d946a458 Constify cuda csbp 2014-07-17 09:43:20 -07:00
Aaron Denney
2982e77495 Pass in images and scratch space so that multiple copies can run concurrently. 2014-07-17 09:43:20 -07:00
Aaron Denney
fe29ed461c Move shared interface to header file rather than repeating. 2014-07-17 09:43:20 -07:00
Aaron Denney
e532bd50d5 Move shared interface to header file rather than repeating. 2014-07-17 09:43:20 -07:00
Aaron Denney
1533d0448f cdata_weight always positive; fewer multiplications. 2014-07-17 09:43:20 -07:00
Aaron Denney
d848704b35 cuda::DisparityBilateralFilter no longer uses constant memory for parameters
Now multiple filters can be used in the same context without stepping on each other.
2014-07-17 09:43:20 -07:00
Vadim Pisarevsky
8f8450793a Merge pull request #2964 from vbystricky:highgui_split 2014-07-16 19:29:36 +00:00
Lars Glud
8b32235854 Openni2 support 2014-07-16 12:37:53 +02:00
edgarriba
42ab7fd876 dls() no compiles 2014-07-16 00:06:29 +02:00
Petr Glotov
7a77cf584a added timelapse 2014-07-15 09:32:47 -07:00
Vadim Pisarevsky
dbefbbc522 Merge pull request #2910 from ilya-lavrenov:sse2_canny 2014-07-15 09:46:28 +00:00
Vadim Pisarevsky
40370345c5 Merge pull request #2765 from pradeep-pyro:kullback_leibler 2014-07-15 08:57:31 +00:00
Vadim Pisarevsky
b1793e2fb9 Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline 2014-07-15 08:09:04 +00:00
edgarriba
fb67ab1257 Initial DLS add 2014-07-15 09:58:49 +02:00
pradeep
7171431e7c Changed cv::log to std::log 2014-07-15 12:32:53 +08:00
VBystricky
ca307669d4 Refresh code. Fix merge conflict 2014-07-14 23:30:50 +04:00
Vadim Pisarevsky
b63a7e66db Merge pull request #2953 from gongzg:master 2014-07-14 19:21:15 +00:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Vadim Pisarevsky
f773cd9a3e Merge pull request #2947 from vbystricky:capDShow 2014-07-14 18:53:25 +00:00
Alexander Alekhin
381986d044 Merge pull request #2882 from akarsakov:ocl_pyrDown_opt 2014-07-14 18:48:28 +00:00
Roman Donchenko
3490a5aded Merge pull request #2962 from alalek:fix_v4l_build 2014-07-14 08:20:54 +00:00
Alexander Alekhin
e169083fed Merge pull request #2918 from vbystricky:oclopt_reduce2 2014-07-12 05:00:57 +00:00
Alexander Alekhin
df74a266cf Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool 2014-07-11 14:55:13 +00:00
Alexander Alekhin
0876ec7a67 Merge pull request #2935 from vbystricky:oclopt_meanStdDev 2014-07-11 14:53:46 +00:00
Alexander Alekhin
cbf63b0709 Merge pull request #2851 from ilya-lavrenov:tapi_set_identity 2014-07-11 10:00:16 +00:00
Alexander Alekhin
910d8f8e0b Merge pull request #2888 from ilya-lavrenov:tapi_remap 2014-07-11 09:59:27 +00:00
Ilya Lavrenov
f2a2467de3 enabled BufferPool 2014-07-11 12:21:10 +04:00
Alexander Alekhin
6dd3244019 fix build 2014-07-10 18:08:38 +04:00
Ilya Lavrenov
fee3d6931b corners 2014-07-10 17:17:24 +04:00
Ilya Lavrenov
c949845a6b fixed perf test 2014-07-10 16:03:31 +04:00