Commit Graph

14026 Commits

Author SHA1 Message Date
Ernest Galbrun
551ab83cf2 trailing whitespace 2014-07-23 14:34:22 +02:00
Ernest Galbrun
d7038423dd Merge branch 'master' of https://github.com/Itseez/opencv 2014-07-23 14:21:45 +02:00
Ernest Galbrun
6a769c92b3 modified default stream initialization to allow concurrent calls modified cuda surf.cuda.cpp to allow concurrent call 2014-07-23 14:21:21 +02:00
Vadim Pisarevsky
da1ac35930 Merge pull request #2990 from vbystricky:highgui_split2 2014-07-23 11:27:25 +00:00
Vadim Pisarevsky
7bd7c85b1d Merge pull request #2919 from larshg:Openni2Support 2014-07-23 11:23:48 +00:00
Alexander Alekhin
58cf2a8f19 Merge pull request #2995 from ElenaGvozdeva:ipp_DFT 2014-07-23 10:50:43 +00:00
Elena Gvozdeva
4fdd6de8e8 Fixed ippiDFT call 2014-07-23 13:39:31 +04:00
Alexander Karsakov
1d2cf0e20e Added nonzero_rows support 2014-07-22 18:31:08 +04:00
Alexander Karsakov
52f76a3283 Added rest Elena's changes 2014-07-22 18:31:08 +04:00
Alexander Karsakov
7791264525 Added multi-block scheme 2014-07-22 18:31:03 +04:00
Alexander Karsakov
2b9e556055 Added Elena's changes with implemented DFT_INVERSE C2C mode. 2014-07-22 18:27:31 +04:00
Alexander Karsakov
b17bf031f6 Added DFT_SCALE for forward transforms 2014-07-22 18:27:31 +04:00
Alexander Karsakov
6c8b6bd0c7 Added packing to CCS format 2014-07-22 18:27:25 +04:00
Alexander Karsakov
ed07241f89 Completed all forward transforms. 2014-07-22 18:27:17 +04:00
Alexander Karsakov
e5a3ab3cb9 Added fftplan cache 2014-07-22 18:27:08 +04:00
Alexander Karsakov
0318d27720 Enabled precalculated wave 2014-07-22 18:26:58 +04:00
Alexander Karsakov
5dd9263848 Multi-radix with kernel generation 2014-07-22 18:25:59 +04:00
Alexander Alekhin
63a8cb594a Merge pull request #2961 from ilya-lavrenov:tapi_corners 2014-07-22 09:38:11 +00:00
vbystricky
716218cac4 Optimize ocl version of warp_affine 2014-07-22 13:22:40 +04:00
András Kovács
d1c7983fe5 calibrateDebevec index fix (issue 3664) 2014-07-21 17:27:03 +02:00
Sergey Nikulov
9d107fb2d5 fixed test compilation 2014-07-21 19:26:26 +04:00
Sergey Nikulov
bd144cfa64 upmerged pull req #2974 to master - added more jpeg options to imgcodecs 2014-07-21 18:56:35 +04:00
vbystricky
fd51c133df Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs 2014-07-21 15:10:41 +04:00
Alexander Alekhin
9e3124a1c9 Merge pull request #2960 from ilya-lavrenov:tapi_perf_fix 2014-07-21 09:10:24 +00:00
Alexander Alekhin
315c80f793 Merge pull request #2986 from vbystricky:videoio_fix 2014-07-21 08:21:18 +00:00
Anish Pednekar
d2493393db added macro guard to enable overriding ENABLE_LOG 2014-07-20 21:06:37 +05:30
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