Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
78c70ab948
Merge pull request #747 from taka-no-me:split_c_cpp
2013-04-04 00:55:22 +04:00
Andrey Kamaev
91f6eb7cab
Merge pull request #745 from jet47:fix-gpu-warnings
2013-04-03 15:44:46 +04:00
Vladislav Vinogradov
870563ba25
fixed compilation warning for CUDA files
...
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
Vladislav Vinogradov
366f859ada
fixed compilation after CV_IMPLEMENT_QSORT_EX removing
2013-04-03 12:59:40 +04:00
Vladislav Vinogradov
8d521d4704
disabled perf tests for gpu VideoWriter and VideoReader
2013-04-02 16:49:09 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Vladislav Vinogradov
8e10cd8946
fixed gpu module compilation under windows
2013-04-01 14:15:06 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Vladislav Vinogradov
924b0ef786
fixed bug in TVL1 optical flow:
...
initial optical flow was not cleaned during the second call
2013-03-29 10:40:28 +04:00
Vladislav Vinogradov
76e748ccc1
removed internal_header.hpp - it produces many warnings
2013-03-28 11:49:26 +04:00
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
2013-03-28 11:48:43 +04:00
Andrey Kamaev
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
2013-03-26 18:38:16 +04:00
Vladislav Vinogradov
4dbd0f0e8f
fixed compilation issues with gpu modules:
...
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
2013-03-26 12:33:13 +04:00
Vladislav Vinogradov
4d23e2c8c9
GPU implementation of CLAHE
2013-03-25 17:45:13 +04:00
Andrey Kamaev
8c41c614eb
Merge pull request #700 from cuda-geek/fix_build_with_cuda
...
fix master build with CUDA after latest 2.4 merge
2013-03-25 03:27:31 -07:00
marina.kolpakova
dd9e786a8e
fix build gpu tests after video module refactoring
2013-03-25 09:34:51 +04:00
marina.kolpakova
84f45e1e03
fixed build with CUDA after latest merge
2013-03-25 08:08:36 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
2013-03-21 08:59:34 -07:00
Andrey Kamaev
d756de176f
Merge pull request #679 from jet47:gpu-simd-functions
2013-03-21 14:59:55 +04:00
Vladislav Vinogradov
33ff3d6016
added simd_functions.hpp to device layer
2013-03-21 14:09:19 +04:00
Vladislav Vinogradov
d87b709c26
fixed minMax perf test
2013-03-21 13:46:32 +04:00
Vladislav Vinogradov
0149969463
disable tests that requires video support if it is not available
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
b07bce11ef
increased epsilon in sanity test
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
83def21ba9
increased time limits in perf tests
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
99c49648fa
fixed gpu::LUT on multi device system
2013-03-21 13:39:25 +04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
abc9ef6809
moved utility functions from gpu_perf_test and gpu_test to ts module
2013-03-18 14:06:19 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144
fixed compilation with latest master changes
2013-03-14 20:12:52 +04:00
Vladislav Vinogradov
4a237af814
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu
2013-03-14 18:11:12 +04:00
marina.kolpakova
6daf17f974
remove softcascade host dependencies on gpu module
2013-03-14 12:28:01 +04:00
marina.kolpakova
5120322cea
move gpu version of soft cascade to dedicated module
2013-03-14 12:27:13 +04:00
marina.kolpakova
9b00c14fff
moved documentation for CUDA version of softcascade
2013-03-14 12:25:18 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
Vladislav Vinogradov
4ddf634c30
gpu : implement Bayer* -> Gray color conversion
2013-03-11 15:41:50 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Vladislav Vinogradov
f533f0dca9
fixed gpu sanity tests
2013-02-28 16:54:37 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Vladislav Vinogradov
10402c8a85
fixed gpu HoughCircles test
2013-02-26 16:10:35 +04:00
Vladislav Vinogradov
c9868fc01f
fixed warp tests
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
4f7cfbc26e
fixed gpu bitwise operations with scalars
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
a138e12a26
refactored gpu perf tests and fixed sanity tests
2013-02-26 13:53:38 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Andrey Kamaev
995154d10d
Fix binary compatibility of gpu module
2013-02-22 00:14:58 +04:00
Vladislav Vinogradov
73ffd71a22
Fixed documentation build
2013-02-21 17:06:53 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Andrey Kamaev
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
2fe7482b73
Add support for enums into rst ocv domain
2013-02-19 16:22:20 +04:00
Andrey Kamaev
ff7b604a25
Fix several inconsistent declarations identified by check_doc2 script
2013-02-19 16:22:20 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Vladislav Vinogradov
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Vladislav Vinogradov
2181a41a07
added perf4au app
2013-02-13 15:58:24 +04:00
Vladislav Vinogradov
50f28c9e25
added Warp::reduce function
2013-02-13 15:57:55 +04:00
Vladislav Vinogradov
36e42084f0
added gpu BM optical flow implementation
2013-02-13 15:57:40 +04:00
Vladislav Vinogradov
fe2e89df1b
added gpu::HoughLinesP function
2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
86bd325131
added gpu::normalize function
2013-02-13 15:55:58 +04:00
Vladislav Vinogradov
61b54149b1
added mask support to gpu norm and sum
2013-02-13 15:54:50 +04:00
Vladislav Vinogradov
08914aa708
added gpu compare with scalar
2013-02-13 15:53:03 +04:00
Vladislav Vinogradov
a828b60765
added enqueueHostCallback method to gpu::Stream
2013-02-13 15:51:27 +04:00
Vladislav Vinogradov
ce2fd7fec9
added dual tvl1 optical flow gpu implementation
2013-02-13 15:50:05 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Vladislav Vinogradov
fdb07a0ac1
fix performance issue of gpu reduction
2013-02-12 09:50:41 +04:00
Anatoly Baksheev
79d5724794
BP doc change according to Adrian's request (OpenCV book co-author)
2013-02-07 22:31:39 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
marina.kolpakova
7c98735c0d
add compute capability check
2013-02-03 22:44:13 +04:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
cuda-geek
d874d93e24
Merge pull request #372 from cuda-geek:gpu-cascade-fixes
2013-01-31 20:13:31 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
marina.kolpakova
8b3c717e8f
apply patch #2686
2013-01-30 20:20:06 +04:00
marina.kolpakova
cb329400df
fix tests
2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690
integrate new cascade format to GPU soft cascade implementation
2013-01-30 15:55:04 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
9cb4292d5c
implemented Luv/Lab <-> RGB conversion
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
e446903aac
added more types support for gpu separable filters
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
281d036fcf
optimizations:
...
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vladislav Vinogradov
b7e6b5af1b
fixed tests (call resetDevice, if there was a gpu failure)
2013-01-23 21:05:04 +04:00